Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: chrome/common/automation_messages_internal.h

Issue 12220101: Minimal Chrome Frame with Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync to r184453 Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/automation_messages_internal.h
diff --git a/chrome/common/automation_messages_internal.h b/chrome/common/automation_messages_internal.h
index 00167ee71e81f07a3ce76953edaacd0c74eb7767..51ee9215f60af67d4d89a3995e18dd3f3e80c4f6 100644
--- a/chrome/common/automation_messages_internal.h
+++ b/chrome/common/automation_messages_internal.h
@@ -252,16 +252,18 @@ IPC_MESSAGE_CONTROL3(AutomationMsg_DEPRECATED_WindowKeyPress,
int,
int)
+#if defined(OS_WIN)
// This message notifies the AutomationProvider to create a tab which is
// hosted by an external process.
// Request:
// ExternalTabSettings - settings for external tab
IPC_SYNC_MESSAGE_CONTROL1_4(AutomationMsg_CreateExternalTab,
kkania 2013/02/26 16:36:28 Unfortunately, you need to preserve the line numbe
grt (UTC plus 2) 2013/02/26 16:55:45 Is it okay to put the new preprocessor conditional
ExternalTabSettings /* settings*/,
- gfx::NativeWindow /* Tab container window */,
- gfx::NativeWindow /* Tab window */,
+ HWND /* Tab container window */,
+ HWND /* Tab window */,
int /* Handle to the new tab */,
int /* Session Id of the new tab */)
+#endif // defined(OS_WIN)
// This message notifies the AutomationProvider to navigate to a specified
// url in the external tab with given handle. The first parameter is the
@@ -557,7 +559,7 @@ IPC_MESSAGE_ROUTED2(AutomationMsg_NavigationFailed,
int,
GURL)
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
// This message is an outgoing message from an automation client to Chrome.
// It is used to reposition a chrome tab window.
IPC_MESSAGE_CONTROL2(AutomationMsg_TabReposition,
@@ -718,15 +720,17 @@ IPC_SYNC_MESSAGE_CONTROL2_1(
IPC_MESSAGE_ROUTED1(AutomationMsg_AttachExternalTab,
AttachExternalTabParams)
+#if defined(OS_WIN)
// Sent when the automation client connects to an existing tab.
IPC_SYNC_MESSAGE_CONTROL3_4(AutomationMsg_ConnectExternalTab,
uint64 /* cookie */,
bool /* allow/block tab*/,
- gfx::NativeWindow /* parent window */,
- gfx::NativeWindow /* Tab container window */,
- gfx::NativeWindow /* Tab window */,
+ HWND /* parent window */,
+ HWND /* Tab container window */,
+ HWND /* Tab window */,
int /* Handle to the new tab */,
int /* Session Id of the new tab */)
+#endif // defined(OS_WIN)
// Simulate an end of session. Normally this happens when the user
// shuts down the machine or logs off.

Powered by Google App Engine
This is Rietveld 408576698