diff options
| author | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 01:59:11 +0000 |
|---|---|---|
| committer | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 01:59:11 +0000 |
| commit | a95631cb9427e4d20c243dcd0f36da3fd3e7cb55 (patch) | |
| tree | 09da2c4493a7303671961051b32718830c451ad7 /views/widget | |
| parent | 2007ad49132097b2a2eb10d0025361d1bf7a9340 (diff) | |
| download | chromium_src-a95631cb9427e4d20c243dcd0f36da3fd3e7cb55.zip chromium_src-a95631cb9427e4d20c243dcd0f36da3fd3e7cb55.tar.gz chromium_src-a95631cb9427e4d20c243dcd0f36da3fd3e7cb55.tar.bz2 | |
A collection of fixes allowing the chrome.experimental.popup.* set of APIs to function in circumstances where there is no Browser instance present. This is a symptom of a tab-contents view hosted in an ExternalTabContainer.The major change here is the removal of the explicit dependency on a Browser instance across all of the delegates involved when showing a pop-up API. I modified the following delegates:- ExtensionPopupHost::Delegate- TabContentsDelegate- ExtensionFunctionDispatcher::DelegateBecause the pop-up requires a Profile, and a gfx::NativeWindow, I added methods to the above interfaces to provide them.BUG=noneTEST=ExtensionApiTest.FLAKY_Popup
Review URL: http://codereview.chromium.org/434046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/widget_win.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index a2075c1..76f58e4 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -470,7 +470,9 @@ void WidgetWin::OnCommand(UINT notification_code, int command_id, HWND window) { } LRESULT WidgetWin::OnCreate(CREATESTRUCT* create_struct) { - SetNativeWindowProperty(kWidgetKey, this); + // Widget::GetWidgetFromNativeView expects the contents of this property + // to be of type Widget, so the cast is necessary. + SetNativeWindowProperty(kWidgetKey, static_cast<Widget*>(this)); return 0; } |