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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/automation_messages.h

Issue 12220101: Minimal Chrome Frame with Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed inclusion of web_contents_view.h from automation_provider_win.h. see patch set 5 for trybot… 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
« chrome/browser/ui/views/external_tab_container_win.cc ('K') | « chrome/chrome_tests_unit.gypi ('k') | chrome/common/automation_messages_internal.h » ('j') | ipc/ipc_message_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/automation_messages.h
diff --git a/chrome/common/automation_messages.h b/chrome/common/automation_messages.h
index 0f084dcdaac9651d2f02a8f9dc82f6619755a6a7..2f908f6ed809db5d8759f6fe107d5a5c630cd794 100644
--- a/chrome/common/automation_messages.h
+++ b/chrome/common/automation_messages.h
@@ -53,8 +53,10 @@ IPC_STRUCT_BEGIN(AutomationURLResponse)
IPC_STRUCT_MEMBER(uint64, upload_size)
IPC_STRUCT_END()
+#if defined(OS_WIN)
+
IPC_STRUCT_BEGIN(ExternalTabSettings)
- IPC_STRUCT_MEMBER(gfx::NativeWindow, parent)
+ IPC_STRUCT_MEMBER(HWND, parent)
IPC_STRUCT_MEMBER(gfx::Rect, dimensions)
IPC_STRUCT_MEMBER(unsigned int, style)
IPC_STRUCT_MEMBER(bool, is_incognito)
@@ -66,6 +68,8 @@ IPC_STRUCT_BEGIN(ExternalTabSettings)
IPC_STRUCT_MEMBER(bool, route_all_top_level_navigations)
IPC_STRUCT_END()
+#endif // defined(OS_WIN)
+
IPC_STRUCT_BEGIN(NavigationInfo)
IPC_STRUCT_MEMBER(int, navigation_type)
IPC_STRUCT_MEMBER(int, relative_offset)
@@ -120,7 +124,7 @@ IPC_STRUCT_BEGIN(AttachExternalTabParams)
IPC_STRUCT_MEMBER(std::string, profile_name)
IPC_STRUCT_END()
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
IPC_STRUCT_BEGIN(Reposition_Params)
IPC_STRUCT_MEMBER(HWND, window)
« chrome/browser/ui/views/external_tab_container_win.cc ('K') | « chrome/chrome_tests_unit.gypi ('k') | chrome/common/automation_messages_internal.h » ('j') | ipc/ipc_message_utils.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698