diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-20 04:22:44 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-20 04:22:44 +0000 |
| commit | 3c3ba740c63a178807cc0c1a563080e0adbfe143 (patch) | |
| tree | 78bcd84e7870d8009165df0e7a9fca87f4e91903 /chrome/browser/views/info_bubble.cc | |
| parent | 76724d00d3498f952d945d775a3f33f751624121 (diff) | |
| download | chromium_src-3c3ba740c63a178807cc0c1a563080e0adbfe143.zip chromium_src-3c3ba740c63a178807cc0c1a563080e0adbfe143.tar.gz chromium_src-3c3ba740c63a178807cc0c1a563080e0adbfe143.tar.bz2 | |
Relanding focus manager refactoring with build fix, see:http://codereview.chromium.org/125148BUG=NoneTEST=NoneTBR=ben
Review URL: http://codereview.chromium.org/141013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18889 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, 4 insertions, 6 deletions
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 908aa54..031caaf 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, true); + WidgetWin::Init(parent->GetNativeWindow(), bounds); #else WidgetGtk::Init(GTK_WIDGET(parent->GetNativeWindow()), bounds, true); #endif @@ -155,11 +155,9 @@ void InfoBubble::Init(views::Window* parent, #if defined(OS_WIN) // Register the Escape accelerator for closing. - views::FocusManager* focus_manager = - views::FocusManager::GetFocusManager(GetNativeView()); - focus_manager->RegisterAccelerator(views::Accelerator(VK_ESCAPE, false, - false, false), - this); + GetFocusManager()->RegisterAccelerator(views::Accelerator(VK_ESCAPE, false, + false, false), + this); // Set initial alpha value of the layered window. SetLayeredWindowAttributes(GetNativeView(), RGB(0xFF, 0xFF, 0xFF), |