Hello andreip,
I'd like you to do a code review. Please execute
g4 diff -c 8779859
or point your web browser to
http://mondrian/8779859
to review the following code:
Change 8779859 by [EMAIL PROTECTED] on 2008/10/29 16:11:18 *pending*
Spits base/ie/atl_headers.h into two ...
- base/common/atl_headers_win32.h - ATL includes for Win32 and WinCE
- base/ie/atl_browser_headers.h - ATL includes for IE - includes
base/common/atl_headers_win32.h
R=andreip
[EMAIL PROTECTED]
DELTA=190 (97 added, 68 deleted, 25 changed)
OCL=8779859
Affected files ...
... //depot/googleclient/gears/opensource/gears/base/common/async_router.cc#4
edit
...
//depot/googleclient/gears/opensource/gears/base/common/atl_headers_win32.h#1
add
... //depot/googleclient/gears/opensource/gears/base/common/common_ie.h#4 edit
... //depot/googleclient/gears/opensource/gears/base/common/common_np.h#6 edit
...
//depot/googleclient/gears/opensource/gears/base/common/html_event_monitor.h#4
edit
...
//depot/googleclient/gears/opensource/gears/base/common/ipc_message_queue_win32.cc#11
edit
... //depot/googleclient/gears/opensource/gears/base/common/js_runner_ie.cc#23
edit
... //depot/googleclient/gears/opensource/gears/base/common/js_types.cc#50 edit
...
//depot/googleclient/gears/opensource/gears/base/common/wince_compatibility.h#5
edit
... //depot/googleclient/gears/opensource/gears/base/ie/activex_utils.h#5 edit
... //depot/googleclient/gears/opensource/gears/base/ie/atl_browser_headers.h#1
add
... //depot/googleclient/gears/opensource/gears/base/ie/atl_headers.h#2 delete
... //depot/googleclient/gears/opensource/gears/base/ie/bho.h#3 edit
... //depot/googleclient/gears/opensource/gears/base/ie/browser_listener.h#1
edit
... //depot/googleclient/gears/opensource/gears/base/ie/ie_version.cc#1 edit
... //depot/googleclient/gears/opensource/gears/base/ie/module_wrapper.h#7 edit
...
//depot/googleclient/gears/opensource/gears/installer/common/periodic_checker.h#1
edit
...
//depot/googleclient/gears/opensource/gears/localserver/chrome/gears_protocol_handler.cc#1
edit
...
//depot/googleclient/gears/opensource/gears/localserver/common/file_store.cc#5
edit
...
//depot/googleclient/gears/opensource/gears/localserver/common/http_cookies.cc#7
edit
...
//depot/googleclient/gears/opensource/gears/localserver/ie/async_task_ie.h#8
edit
...
//depot/googleclient/gears/opensource/gears/localserver/ie/http_handler_ie.h#3
edit
...
//depot/googleclient/gears/opensource/gears/localserver/ie/http_request_ie.cc#22
edit
...
//depot/googleclient/gears/opensource/gears/localserver/ie/http_request_ie.h#15
edit
...
//depot/googleclient/gears/opensource/gears/localserver/ie/progress_input_stream.h#3
edit
...
//depot/googleclient/gears/opensource/gears/localserver/npapi/async_task_np.h#10
edit
...
//depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.cc#2
edit
...
//depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.h#4
edit
... //depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_host.cc#3 edit
... //depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_host.h#1 edit
...
//depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_host_iemobile.h#1
edit
... //depot/googleclient/gears/opensource/gears/ui/ie/tools_menu_item.h#2 edit
...
//depot/googleclient/gears/opensource/gears/workerpool/ie/pool_threads_manager.cc#21
edit
190 delta lines: 97 added, 68 deleted, 25 changed
Also consider running:
g4 lint -c 8779859
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 8779859 by [EMAIL PROTECTED] on 2008/10/29 16:11:18 *pending*
Spits base/ie/atl_headers.h into two ...
- base/common/atl_headers_win32.h - ATL includes for Win32 and WinCE
- base/ie/atl_browser_headers.h - ATL includes for IE - includes
base/common/atl_headers_win32.h
OCL=8779859
Affected files ...
... //depot/googleclient/gears/opensource/gears/base/common/async_router.cc#4
edit
...
//depot/googleclient/gears/opensource/gears/base/common/atl_headers_win32.h#1
add
... //depot/googleclient/gears/opensource/gears/base/common/common_ie.h#4 edit
... //depot/googleclient/gears/opensource/gears/base/common/common_np.h#6 edit
...
//depot/googleclient/gears/opensource/gears/base/common/html_event_monitor.h#4
edit
...
//depot/googleclient/gears/opensource/gears/base/common/ipc_message_queue_win32.cc#11
edit
... //depot/googleclient/gears/opensource/gears/base/common/js_runner_ie.cc#23
edit
... //depot/googleclient/gears/opensource/gears/base/common/js_types.cc#50 edit
...
//depot/googleclient/gears/opensource/gears/base/common/wince_compatibility.h#5
edit
... //depot/googleclient/gears/opensource/gears/base/ie/activex_utils.h#5 edit
... //depot/googleclient/gears/opensource/gears/base/ie/atl_browser_headers.h#1
add
... //depot/googleclient/gears/opensource/gears/base/ie/atl_headers.h#2 delete
... //depot/googleclient/gears/opensource/gears/base/ie/bho.h#3 edit
... //depot/googleclient/gears/opensource/gears/base/ie/browser_listener.h#1
edit
... //depot/googleclient/gears/opensource/gears/base/ie/ie_version.cc#1 edit
... //depot/googleclient/gears/opensource/gears/base/ie/module_wrapper.h#7 edit
...
//depot/googleclient/gears/opensource/gears/installer/common/periodic_checker.h#1
edit
...
//depot/googleclient/gears/opensource/gears/localserver/chrome/gears_protocol_handler.cc#1
edit
...
//depot/googleclient/gears/opensource/gears/localserver/common/file_store.cc#5
edit
...
//depot/googleclient/gears/opensource/gears/localserver/common/http_cookies.cc#7
edit
...
//depot/googleclient/gears/opensource/gears/localserver/ie/async_task_ie.h#8
edit
...
//depot/googleclient/gears/opensource/gears/localserver/ie/http_handler_ie.h#3
edit
...
//depot/googleclient/gears/opensource/gears/localserver/ie/http_request_ie.cc#22
edit
...
//depot/googleclient/gears/opensource/gears/localserver/ie/http_request_ie.h#15
edit
...
//depot/googleclient/gears/opensource/gears/localserver/ie/progress_input_stream.h#3
edit
...
//depot/googleclient/gears/opensource/gears/localserver/npapi/async_task_np.h#10
edit
...
//depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.cc#2
edit
...
//depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.h#4
edit
... //depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_host.cc#3 edit
... //depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_host.h#1 edit
...
//depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_host_iemobile.h#1
edit
... //depot/googleclient/gears/opensource/gears/ui/ie/tools_menu_item.h#2 edit
...
//depot/googleclient/gears/opensource/gears/workerpool/ie/pool_threads_manager.cc#21
edit
==== //depot/googleclient/gears/opensource/gears/base/common/async_router.cc#4
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/common/async_router.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/common/async_router.cc
2008-10-29 16:11:09.000000000 +0000
+++ googleclient/gears/opensource/gears/base/common/async_router.cc
2008-10-29 16:11:19.000000000 +0000
@@ -23,9 +23,9 @@
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include "gears/base/common/async_router.h"
+
#include <assert.h>
-#include "gears/base/common/async_router.h"
-#include "gears/base/common/message_queue.h"
// static
AsyncRouter *AsyncRouter::GetInstance() {
====
//depot/googleclient/gears/opensource/gears/base/common/atl_headers_win32.h#1 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/common/atl_headers_win32.h
====
# action=add type=text
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ googleclient/gears/opensource/gears/base/common/atl_headers_win32.h
2008-10-29 16:11:22.000000000 +0000
@@ -0,0 +1,50 @@
+// Copyright 2006, Google Inc.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
notice,
+// this list of conditions and the following disclaimer in the
documentation
+// and/or other materials provided with the distribution.
+// 3. Neither the name of Google Inc. nor the names of its contributors may be
+// used to endorse or promote products derived from this software without
+// specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef GEARS_BASE_COMMON_ATL_HEADERS_WIN32_H__
+#define GEARS_BASE_COMMON_ATL_HEADERS_WIN32_H__
+
+#ifndef _ATL_NO_EXCEPTIONS // may be defined via command-line flags
+#define _ATL_NO_EXCEPTIONS
+#endif
+#ifdef OS_WINCE
+#define _ATL_FREE_THREADED
+#else
+#define _ATL_APARTMENT_THREADED
+#endif
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
+#define _ATL_ALL_WARNINGS
+#define _ATL_STATIC_REGISTRY
+// uncomment this to turn on QueryInterface tracing
+//#ifdef DEBUG
+//#define _ATL_DEBUG_QI
+//#endif
+
+#include <atlbase.h>
+#include <atlsync.h> // For ATL::CMutex etc
+#include <atlstr.h> // For ATL::CStringW etc
+#include <atlwin.h> // For ATL::CWindowImpl etc
+
+#endif // GEARS_BASE_COMMON_ATL_HEADERS_WIN32_H__
==== //depot/googleclient/gears/opensource/gears/base/common/common_ie.h#4 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/common/common_ie.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/common/common_ie.h 2008-10-29
16:11:09.000000000 +0000
+++ googleclient/gears/opensource/gears/base/common/common_ie.h 2008-10-29
16:11:25.000000000 +0000
@@ -32,9 +32,8 @@
#ifdef OS_WINCE
#include "gears/base/common/wince_compatibility.h" // For GearsTrace
#endif
+#include "gears/base/ie/atl_browser_headers.h"
// TODO(cprince): change ATLASSERT to DCHECK
-// TODO(steveblock): Factor out browser-independent parts of this include.
-#include "gears/base/ie/atl_headers.h"
#ifdef OS_WINCE
==== //depot/googleclient/gears/opensource/gears/base/common/common_np.h#6 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/common/common_np.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/common/common_np.h 2008-10-29
16:11:10.000000000 +0000
+++ googleclient/gears/opensource/gears/base/common/common_np.h 2008-10-29
16:11:29.000000000 +0000
@@ -88,12 +88,11 @@
// For the NPAPI on Win32 and WinCE build targets
//-----------------------------------------------------------------------------
#include <windows.h> // for DWORD
+#include "gears/base/common/atl_headers_win32.h"
#ifdef OS_WINCE
#include "gears/base/common/wince_compatibility.h" // For GearsTrace
#endif
// TODO(cprince): change ATLASSERT to DCHECK
-// TODO(steveblock): Factor out browser-independent parts of this include.
-#include "gears/base/ie/atl_headers.h"
#ifdef OS_WINCE
// Use of ATLTRACE (which is used by LOG and LOG16) may cause a stack fault on
====
//depot/googleclient/gears/opensource/gears/base/common/html_event_monitor.h#4
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/common/html_event_monitor.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/common/html_event_monitor.h
2008-10-29 16:11:10.000000000 +0000
+++ googleclient/gears/opensource/gears/base/common/html_event_monitor.h
2008-10-29 16:11:33.000000000 +0000
@@ -36,7 +36,7 @@
#include <webvw.h>
#else
#include <mshtml.h>
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#endif
#endif
====
//depot/googleclient/gears/opensource/gears/base/common/ipc_message_queue_win32.cc#11
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/common/ipc_message_queue_win32.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/common/ipc_message_queue_win32.cc
2008-10-29 16:11:10.000000000 +0000
+++ googleclient/gears/opensource/gears/base/common/ipc_message_queue_win32.cc
2008-10-29 16:11:37.000000000 +0000
@@ -35,7 +35,7 @@
#include "gears/base/common/message_queue.h"
#include "gears/base/common/scoped_refptr.h"
#include "gears/base/common/stopwatch.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/common/atl_headers_win32.h"
#if !BROWSER_NONE
#include "gears/factory/factory_utils.h" // for AppendBuildInfo
#endif
==== //depot/googleclient/gears/opensource/gears/base/common/js_runner_ie.cc#23
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/common/js_runner_ie.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/common/js_runner_ie.cc
2008-10-29 16:11:10.000000000 +0000
+++ googleclient/gears/opensource/gears/base/common/js_runner_ie.cc
2008-10-29 16:11:41.000000000 +0000
@@ -51,7 +51,7 @@
#include "gears/base/common/wince_compatibility.h" // For CallWindowOnerror()
#endif
#include "gears/base/ie/activex_utils.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/base/ie/module_wrapper.h"
#include "third_party/AtlActiveScriptSite.h"
==== //depot/googleclient/gears/opensource/gears/base/common/js_types.cc#50 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/common/js_types.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/common/js_types.cc 2008-10-29
16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/base/common/js_types.cc 2008-10-29
16:11:44.000000000 +0000
@@ -39,7 +39,7 @@
#elif BROWSER_IE
#include <dispex.h>
#include "gears/base/ie/activex_utils.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/base/ie/module_wrapper.h"
#include "genfiles/interfaces.h"
#elif BROWSER_NPAPI
====
//depot/googleclient/gears/opensource/gears/base/common/wince_compatibility.h#5
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/common/wince_compatibility.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/common/wince_compatibility.h
2008-10-29 16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/base/common/wince_compatibility.h
2008-10-29 16:11:48.000000000 +0000
@@ -29,9 +29,8 @@
#ifndef GEARS_BASE_COMMON_WINCE_COMPATIBILITY_H__
#define GEARS_BASE_COMMON_WINCE_COMPATIBILITY_H__
-#include <atlbase.h>
-#include <atlsync.h>
-#include <connmgr.h>
+#include "gears/base/common/atl_headers_win32.h"
+#include <connmgr.h> // Must be inlcuded after ATL includes
#include <connmgr_status.h>
#include <crtdefs.h>
#include <windows.h>
==== //depot/googleclient/gears/opensource/gears/base/ie/activex_utils.h#5 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/ie/activex_utils.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/ie/activex_utils.h 2008-10-29
16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/base/ie/activex_utils.h 2008-10-29
16:11:52.000000000 +0000
@@ -31,7 +31,7 @@
#include <vector>
#include "gears/base/common/scoped_refptr.h"
#include "gears/base/common/string16.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
struct IHTMLElement;
class BrowsingContext;
====
//depot/googleclient/gears/opensource/gears/base/ie/atl_browser_headers.h#1 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/ie/atl_browser_headers.h
====
# action=add type=text
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ googleclient/gears/opensource/gears/base/ie/atl_browser_headers.h
2008-10-29 16:11:55.000000000 +0000
@@ -0,0 +1,40 @@
+// Copyright 2006, Google Inc.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
notice,
+// this list of conditions and the following disclaimer in the
documentation
+// and/or other materials provided with the distribution.
+// 3. Neither the name of Google Inc. nor the names of its contributors may be
+// used to endorse or promote products derived from this software without
+// specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef GEARS_BASE_IE_ATL_BROWSER_HEADERS_H__
+#define GEARS_BASE_IE_ATL_BROWSER_HEADERS_H__
+
+#include "gears/base/common/atl_headers_win32.h"
+
+//#include <atlbase.h>
+#include <atlcom.h>
+#include <atlconv.h>
+#include <atlctl.h>
+#include <atlhost.h>
+//#include <atlstr.h>
+#include <atltypes.h>
+//#include <atlwin.h>
+
+#endif // GEARS_BASE_IE_ATL_BROWSER_HEADERS_H__
==== //depot/googleclient/gears/opensource/gears/base/ie/atl_headers.h#2 - None
====
# action=delete type=text
==== //depot/googleclient/gears/opensource/gears/base/ie/bho.h#3 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/ie/bho.h ====
# action=edit type=xtext
--- googleclient/gears/opensource/gears/base/ie/bho.h 2008-10-29
16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/base/ie/bho.h 2008-10-29
16:12:01.000000000 +0000
@@ -26,7 +26,7 @@
#ifndef GEARS_BASE_IE_BHO_H__
#define GEARS_BASE_IE_BHO_H__
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/base/ie/resource.h" // for .rgs resource ids (IDR_*)
#include "genfiles/interfaces.h"
==== //depot/googleclient/gears/opensource/gears/base/ie/browser_listener.h#1 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/ie/browser_listener.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/ie/browser_listener.h
2008-10-29 16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/base/ie/browser_listener.h
2008-10-29 16:12:05.000000000 +0000
@@ -26,7 +26,7 @@
#ifndef GEARS_BASE_IE_BROWSER_LISTENER_H__
#define GEARS_BASE_IE_BROWSER_LISTENER_H__
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
// Use this calss to capture all the IDispatch invokes.
template<class T>
==== //depot/googleclient/gears/opensource/gears/base/ie/ie_version.cc#1 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/ie/ie_version.cc ====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/ie/ie_version.cc 2008-10-29
16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/base/ie/ie_version.cc 2008-10-29
16:12:09.000000000 +0000
@@ -23,9 +23,10 @@
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include "gears/base/ie/ie_version.h"
+
#include "gears/base/common/vista_utils.h"
-#include "gears/base/ie/atl_headers.h"
-#include "gears/base/ie/ie_version.h"
+#include "gears/base/ie/atl_browser_headers.h"
static CString GetIEVersion() {
==== //depot/googleclient/gears/opensource/gears/base/ie/module_wrapper.h#7 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/base/ie/module_wrapper.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/base/ie/module_wrapper.h
2008-10-29 16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/base/ie/module_wrapper.h
2008-10-29 16:12:12.000000000 +0000
@@ -31,7 +31,7 @@
#include "gears/base/common/common.h"
#include "gears/base/common/dispatcher.h"
#include "gears/base/common/js_types.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "genfiles/interfaces.h"
#include "third_party/scoped_ptr/scoped_ptr.h"
====
//depot/googleclient/gears/opensource/gears/installer/common/periodic_checker.h#1
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/installer/common/periodic_checker.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/installer/common/periodic_checker.h
2008-10-29 16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/installer/common/periodic_checker.h
2008-10-29 16:12:17.000000000 +0000
@@ -33,11 +33,9 @@
#ifndef GEARS_INSTALLER_IEMOBILE_PERIODIC_CHECKER_H__
#define GEARS_INSTALLER_IEMOBILE_PERIODIC_CHECKER_H__
-#include <atlsync.h> // For CEvent
+#include "gears/base/common/atl_headers_win32.h"
#include <gears/base/common/string16.h>
#include "gears/base/common/wince_compatibility.h"
-// TODO(steveblock): Separate out browser-independent parts of this include.
-#include "gears/base/ie/atl_headers.h"
// An implemnentation detail of PeriodicChecker.
class VersionFetchTask;
====
//depot/googleclient/gears/opensource/gears/localserver/chrome/gears_protocol_handler.cc#1
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/localserver/chrome/gears_protocol_handler.cc
====
# action=edit type=text
---
googleclient/gears/opensource/gears/localserver/chrome/gears_protocol_handler.cc
2008-10-08 09:50:53.000000000 +0100
+++
googleclient/gears/opensource/gears/localserver/chrome/gears_protocol_handler.cc
2008-10-29 16:12:20.000000000 +0000
@@ -35,7 +35,7 @@
// TODO(mpcomplete): maybe this resource fetching should be generalized?
#ifdef WIN32
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/common/atl_headers_win32.h"
#define HTML MAKEINTRESOURCE(23)
static LANGID LocaleCodeToLANGID(const std::string16 &locale) {
====
//depot/googleclient/gears/opensource/gears/localserver/common/file_store.cc#5
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/localserver/common/file_store.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/localserver/common/file_store.cc
2008-10-29 16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/localserver/common/file_store.cc
2008-10-29 16:12:24.000000000 +0000
@@ -25,7 +25,7 @@
#ifdef DEBUG
#if BROWSER_IE
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#endif
#endif
====
//depot/googleclient/gears/opensource/gears/localserver/common/http_cookies.cc#7
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/localserver/common/http_cookies.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/localserver/common/http_cookies.cc
2008-10-29 16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/localserver/common/http_cookies.cc
2008-10-29 16:12:28.000000000 +0000
@@ -162,7 +162,7 @@
#if BROWSER_IE
#include <windows.h>
#include <wininet.h>
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
bool GetCookieString(const char16 *url, BrowsingContext *context,
std::string16 *cookies_out) {
====
//depot/googleclient/gears/opensource/gears/localserver/ie/async_task_ie.h#8 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/localserver/ie/async_task_ie.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/localserver/ie/async_task_ie.h
2008-10-29 16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/localserver/ie/async_task_ie.h
2008-10-29 16:12:32.000000000 +0000
@@ -30,7 +30,8 @@
#include <vector>
#include "gears/base/common/browsing_context.h"
#include "gears/base/common/string16.h"
-#include "gears/base/ie/atl_headers.h" // include this before other ATL headers
+// Include this before other ATL headers
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/localserver/common/critical_section.h"
#include "gears/localserver/common/http_request.h"
#include "gears/localserver/common/resource_store.h"
====
//depot/googleclient/gears/opensource/gears/localserver/ie/http_handler_ie.h#3
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/localserver/ie/http_handler_ie.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/localserver/ie/http_handler_ie.h
2008-10-29 16:11:11.000000000 +0000
+++ googleclient/gears/opensource/gears/localserver/ie/http_handler_ie.h
2008-10-29 16:12:35.000000000 +0000
@@ -51,7 +51,7 @@
#define GEARS_LOCALSERVER_IE_HTTP_HANDLER_IE_H__
#include "gears/base/common/security_model.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/localserver/common/localserver_db.h"
#include "third_party/passthru_app/ProtocolCF.h"
#include "third_party/passthru_app/ProtocolImpl.h"
====
//depot/googleclient/gears/opensource/gears/localserver/ie/http_request_ie.cc#22
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/localserver/ie/http_request_ie.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/localserver/ie/http_request_ie.cc
2008-10-29 16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/localserver/ie/http_request_ie.cc
2008-10-29 16:12:39.000000000 +0000
@@ -35,7 +35,6 @@
#include "gears/base/common/http_utils.h"
#include "gears/base/common/string_utils.h"
#include "gears/base/common/url_utils.h"
-#include "gears/base/ie/atl_headers.h"
#include "gears/blob/blob_interface.h"
#include "gears/blob/blob_stream_ie.h"
#include "gears/blob/buffer_blob.h"
====
//depot/googleclient/gears/opensource/gears/localserver/ie/http_request_ie.h#15
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/localserver/ie/http_request_ie.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/localserver/ie/http_request_ie.h
2008-10-29 16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/localserver/ie/http_request_ie.h
2008-10-29 16:12:43.000000000 +0000
@@ -30,7 +30,7 @@
#include <vector>
#include "gears/base/common/security_model.h"
#include "gears/base/common/scoped_refptr.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/localserver/common/http_request.h"
#include "gears/localserver/common/localserver_db.h"
#include "gears/localserver/common/progress_event.h"
====
//depot/googleclient/gears/opensource/gears/localserver/ie/progress_input_stream.h#3
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/localserver/ie/progress_input_stream.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/localserver/ie/progress_input_stream.h
2008-10-29 16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/localserver/ie/progress_input_stream.h
2008-10-29 16:12:46.000000000 +0000
@@ -27,7 +27,7 @@
#define GEARS_LOCALSERVER_IE_PROGRESS_INPUT_STREAM_H__
#include "gears/base/common/scoped_refptr.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
class IEHttpRequest;
====
//depot/googleclient/gears/opensource/gears/localserver/npapi/async_task_np.h#10
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/localserver/npapi/async_task_np.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/localserver/npapi/async_task_np.h
2008-10-29 16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/localserver/npapi/async_task_np.h
2008-10-29 16:12:50.000000000 +0000
@@ -31,8 +31,7 @@
#include "gears/base/common/basictypes.h"
#ifdef WIN32
-#include <atlsync.h>
-#include "gears/base/ie/atl_headers.h" // include this before other ATL headers
+#include "gears/base/common/atl_headers_win32.h"
#elif defined(OS_ANDROID)
#include <pthread.h>
#endif
====
//depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.cc#2
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.cc
2008-10-29 16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.cc
2008-10-29 16:12:54.000000000 +0000
@@ -36,7 +36,6 @@
#include "gears/base/common/common.h"
#include "gears/base/common/thread_locals.h"
#include "gears/base/ie/activex_utils.h"
-#include "gears/base/ie/atl_headers.h"
#include "third_party/AtlActiveScriptSite.h"
// Set the permissions dialog object.
====
//depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.h#4
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.h
2008-10-29 16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/ui/ie/html_dialog_bridge_iemobile.h
2008-10-29 16:12:58.000000000 +0000
@@ -33,7 +33,7 @@
#include "genfiles/interfaces.h"
#include "gears/base/common/common.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/ui/ie/ui_resources.h"
#include "gears/factory/factory_utils.h"
==== //depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_host.cc#3 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/ui/ie/html_dialog_host.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/ui/ie/html_dialog_host.cc
2008-10-29 16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/ui/ie/html_dialog_host.cc
2008-10-29 16:13:01.000000000 +0000
@@ -34,7 +34,6 @@
#include "gears/base/common/string_utils.h"
#include "gears/base/common/url_utils.h"
#include "gears/base/common/thread_locals.h"
-#include "gears/base/ie/atl_headers.h"
// The timer associated with making sure navigation errors don't cause a
==== //depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_host.h#1 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/ui/ie/html_dialog_host.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/ui/ie/html_dialog_host.h
2008-10-29 16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/ui/ie/html_dialog_host.h
2008-10-29 16:13:05.000000000 +0000
@@ -44,7 +44,7 @@
#include <mshtmhst.h> // for IHTMLOMWindowServices
#include "gears/base/common/common.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/ui/ie/ui_resources.h"
#include "genfiles/interfaces.h"
====
//depot/googleclient/gears/opensource/gears/ui/ie/html_dialog_host_iemobile.h#1
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/ui/ie/html_dialog_host_iemobile.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/ui/ie/html_dialog_host_iemobile.h
2008-10-29 16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/ui/ie/html_dialog_host_iemobile.h
2008-10-29 16:13:09.000000000 +0000
@@ -48,7 +48,7 @@
#include "genfiles/interfaces.h"
#include "gears/base/common/common.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/ui/ie/ui_resources.h"
#include "gears/base/ie/activex_utils.h"
==== //depot/googleclient/gears/opensource/gears/ui/ie/tools_menu_item.h#2 -
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/ui/ie/tools_menu_item.h
====
# action=edit type=text
--- googleclient/gears/opensource/gears/ui/ie/tools_menu_item.h 2008-10-29
16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/ui/ie/tools_menu_item.h 2008-10-29
16:13:13.000000000 +0000
@@ -27,7 +27,7 @@
#define GEARS_UI_IE_TOOLS_MENU_ITEM_H__
#include "genfiles/interfaces.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/base/ie/resource.h" // for .rgs resource ids (IDR_*)
// This class is used to add a menu items to the tools menu in Internet
====
//depot/googleclient/gears/opensource/gears/workerpool/ie/pool_threads_manager.cc#21
-
c:\MyDocs\Gears4/googleclient/gears/opensource/gears/workerpool/ie/pool_threads_manager.cc
====
# action=edit type=text
--- googleclient/gears/opensource/gears/workerpool/ie/pool_threads_manager.cc
2008-10-29 16:11:12.000000000 +0000
+++ googleclient/gears/opensource/gears/workerpool/ie/pool_threads_manager.cc
2008-10-29 16:13:16.000000000 +0000
@@ -56,7 +56,7 @@
#include "gears/base/common/wince_compatibility.h"
#endif
#include "gears/base/ie/activex_utils.h"
-#include "gears/base/ie/atl_headers.h"
+#include "gears/base/ie/atl_browser_headers.h"
#include "gears/blob/blob_interface.h"
#include "gears/blob/blob_utils.h"
#include "gears/factory/factory_impl.h"
