Hello nigeltao,
I'd like you to do a code review. Please execute
g4 diff -c 9193304
or point your web browser to
http://mondrian/9193304
to review the following code:
Change 9193304 by [EMAIL PROTECTED] on 2008/11/28 12:06:26 *pending*
Fixes WinCE build bustage.
R=nigeltao
[EMAIL PROTECTED]
DELTA=13 (12 added, 0 deleted, 1 changed)
OCL=9193304
Affected files ...
... //depot/googleclient/gears/opensource/gears/desktop/desktop.cc#61 edit
...
//depot/googleclient/gears/opensource/gears/desktop/drag_and_drop_utils_ie.cc#2
edit
13 delta lines: 12 added, 0 deleted, 1 changed
Also consider running:
g4 lint -c 9193304
which verifies that the changelist doesn't introduce new style violations.
If you can't do the review, please let me know as soon as possible. During
your review, please ensure that all new code has corresponding unit tests and
that existing unit tests are updated appropriately. Visit
http://www/eng/code_review.html for more information.
This is a semiautomated message from "g4 mail". Complaints or suggestions?
Mail [EMAIL PROTECTED]
Change 9193304 by [EMAIL PROTECTED] on 2008/11/28 12:06:26 *pending*
Fixes WinCE build bustage.
Affected files ...
... //depot/googleclient/gears/opensource/gears/desktop/desktop.cc#61 edit
...
//depot/googleclient/gears/opensource/gears/desktop/drag_and_drop_utils_ie.cc#2
edit
==== //depot/googleclient/gears/opensource/gears/desktop/desktop.cc#61 -
c:\MyDocs\Gears2/googleclient/gears/opensource/gears/desktop/desktop.cc ====
# action=edit type=text
--- googleclient/gears/opensource/gears/desktop/desktop.cc 2008-11-28
12:28:27.000000000 +0000
+++ googleclient/gears/opensource/gears/desktop/desktop.cc 2008-11-28
12:27:06.000000000 +0000
@@ -55,12 +55,14 @@
#include "third_party/scoped_ptr/scoped_ptr.h"
+#if GEARS_DRAG_AND_DROP_API_IS_SUPPORTED_FOR_THIS_PLATFORM
#if BROWSER_FF
#include "gears/desktop/drag_and_drop_utils_ff.h"
#elif BROWSER_IE
#include "gears/desktop/drag_and_drop_utils_ie.h"
#elif BROWSER_WEBKIT
#include "gears/desktop/drag_and_drop_utils_sf.h"
+#endif
#endif
DECLARE_DISPATCHER(GearsDesktop);
@@ -1046,7 +1048,7 @@
if (context->is_exception_set()) return;
std::string16 error;
-#if BROWSER_FF || (BROWSER_IE && !defined(OS_WINCE)) || BROWSER_WEBKIT
+#if BROWSER_FF || BROWSER_IE || BROWSER_WEBKIT
::AcceptDrag(module_environment_.get(),
event_as_js_object.get(),
&error);
====
//depot/googleclient/gears/opensource/gears/desktop/drag_and_drop_utils_ie.cc#2
-
c:\MyDocs\Gears2/googleclient/gears/opensource/gears/desktop/drag_and_drop_utils_ie.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/desktop/drag_and_drop_utils_ie.cc
2008-11-28 12:28:27.000000000 +0000
+++ googleclient/gears/opensource/gears/desktop/drag_and_drop_utils_ie.cc
2008-11-28 12:02:24.000000000 +0000
@@ -23,6 +23,13 @@
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#ifdef OFFICIAL_BUILD
+// The Drag-and-Drop API has not been finalized for official builds.
+#else
+
+#include "gears/desktop/drop_target_base.h"
+#if GEARS_DRAG_AND_DROP_API_IS_SUPPORTED_FOR_THIS_PLATFORM
+
#include <mshtmdid.h>
#include <shlobj.h>
#include <windows.h>
@@ -207,3 +214,6 @@
return;
}
}
+
+#endif // GEARS_DRAG_AND_DROP_API_IS_SUPPORTED_FOR_THIS_PLATFORM
+#endif // OFFICIAL_BUILD
