diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 18:43:58 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 18:43:58 +0000 |
| commit | 6cbdc7b14f382a976c78699d1fd145a9eecfad49 (patch) | |
| tree | 2bbbc2fc7c08efc919dd5d4885d76c92f1c2cfc8 /chrome/common/automation_messages_internal.h | |
| parent | 71936c22e8a6815314c62cba2c58036824e16031 (diff) | |
| download | chromium_src-6cbdc7b14f382a976c78699d1fd145a9eecfad49.zip chromium_src-6cbdc7b14f382a976c78699d1fd145a9eecfad49.tar.gz chromium_src-6cbdc7b14f382a976c78699d1fd145a9eecfad49.tar.bz2 | |
Fix official builder compile error when building aura on windows
The error is in the chrome_frame_common project
chrome_frame_automation.cc (833) : error C2440: '=' cannot convert from HWND to gfx::NativeWindow
That is because in aura the gfx::NativeWindow is a aura::Window* instead of HWND
BUG=171018
TEST=see bug
Review URL: https://codereview.chromium.org/12022038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/automation_messages_internal.h')
| -rw-r--r-- | chrome/common/automation_messages_internal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/common/automation_messages_internal.h b/chrome/common/automation_messages_internal.h index 64a17a4..b42dafc 100644 --- a/chrome/common/automation_messages_internal.h +++ b/chrome/common/automation_messages_internal.h @@ -258,8 +258,8 @@ IPC_MESSAGE_CONTROL3(AutomationMsg_DEPRECATED_WindowKeyPress, // ExternalTabSettings - settings for external tab IPC_SYNC_MESSAGE_CONTROL1_4(AutomationMsg_CreateExternalTab, ExternalTabSettings /* settings*/, - gfx::NativeWindow /* Tab container window */, - gfx::NativeWindow /* Tab window */, + gfx::AcceleratedWidget /* Tab container window */, + gfx::AcceleratedWidget /* Tab window */, int /* Handle to the new tab */, int /* Session Id of the new tab */) @@ -722,9 +722,9 @@ IPC_MESSAGE_ROUTED1(AutomationMsg_AttachExternalTab, 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 */, + gfx::AcceleratedWidget /* parent window */, + gfx::AcceleratedWidget /* Tab container window */, + gfx::AcceleratedWidget /* Tab window */, int /* Handle to the new tab */, int /* Session Id of the new tab */) |