diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 15:27:45 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 15:27:45 +0000 |
| commit | c39e715f96f482ebf4b2a00405bb3ccb5b8e8826 (patch) | |
| tree | 7075abb007b554979d25fb7218283f048e1b792e /chrome/browser/views/info_bubble.cc | |
| parent | 211386d58b7fb341e2a895e5776e8380184d58c4 (diff) | |
| download | chromium_src-c39e715f96f482ebf4b2a00405bb3ccb5b8e8826.zip chromium_src-c39e715f96f482ebf4b2a00405bb3ccb5b8e8826.tar.gz chromium_src-c39e715f96f482ebf4b2a00405bb3ccb5b8e8826.tar.bz2 | |
Revert :
Changed by: jcampan@chromium.org
Changed at: Fri 19 Jun 2009 21:22:47
Branch: src
Revision: 18889
Comments:
Relanding focus manager refactoring with build fix, see:http://codereview.chromium.org/125148BUG=NoneTEST=NoneTBR=ben
Review URL: http://codereview.chromium.org/141013
Because it creates hundreds of new reliability crashes.
TBR:jcampan
Review URL: http://codereview.chromium.org/140064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/info_bubble.cc')
| -rw-r--r-- | chrome/browser/views/info_bubble.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 031caaf..908aa54 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -133,7 +133,7 @@ void InfoBubble::Init(views::Window* parent, content_view_->CalculateWindowBoundsAndAjust(position_relative_to); #if defined(OS_WIN) - WidgetWin::Init(parent->GetNativeWindow(), bounds); + WidgetWin::Init(parent->GetNativeWindow(), bounds, true); #else WidgetGtk::Init(GTK_WIDGET(parent->GetNativeWindow()), bounds, true); #endif @@ -155,9 +155,11 @@ void InfoBubble::Init(views::Window* parent, #if defined(OS_WIN) // Register the Escape accelerator for closing. - GetFocusManager()->RegisterAccelerator(views::Accelerator(VK_ESCAPE, false, - false, false), - this); + views::FocusManager* focus_manager = + views::FocusManager::GetFocusManager(GetNativeView()); + focus_manager->RegisterAccelerator(views::Accelerator(VK_ESCAPE, false, + false, false), + this); // Set initial alpha value of the layered window. SetLayeredWindowAttributes(GetNativeView(), RGB(0xFF, 0xFF, 0xFF), |