Index: chrome/browser/ui/panels/panel_browser_window_gtk.cc |
diff --git a/chrome/browser/ui/panels/panel_browser_window_gtk.cc b/chrome/browser/ui/panels/panel_browser_window_gtk.cc |
index f84b84fdcff9c8eb8ea2f7d482ee62665782d5e7..ddce6f9e0a052e074762a604959dd75a6aaff956 100644 |
--- a/chrome/browser/ui/panels/panel_browser_window_gtk.cc |
+++ b/chrome/browser/ui/panels/panel_browser_window_gtk.cc |
@@ -97,10 +97,6 @@ void PanelBrowserWindowGtk::Init() { |
ui::WorkAreaWatcherX::AddObserver(this); |
registrar_.Add( |
this, |
- chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE, |
- content::Source<Panel>(panel_.get())); |
- registrar_.Add( |
- this, |
chrome::NOTIFICATION_PANEL_CHANGED_LAYOUT_MODE, |
content::Source<Panel>(panel_.get())); |
registrar_.Add( |
@@ -275,9 +271,6 @@ void PanelBrowserWindowGtk::Observe( |
switch (type) { |
case chrome::NOTIFICATION_PANEL_CHANGED_LAYOUT_MODE: |
titlebar()->UpdateCustomFrame(true); |
- // No break. Accept focus code should execute for both cases. |
- case chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE: |
- gtk_window_set_accept_focus(window(), !panel_->IsMinimized()); |
break; |
case chrome::NOTIFICATION_WINDOW_CLOSED: |
// Cleanup. |
@@ -387,6 +380,11 @@ bool PanelBrowserWindowGtk::IsPanelActive() const { |
return IsActive(); |
} |
+void PanelBrowserWindowGtk::PreventActivationByOS(bool prevent_activation) { |
+ gtk_window_set_accept_focus(window(), !prevent_activation); |
+ return; |
+} |
+ |
gfx::NativeWindow PanelBrowserWindowGtk::GetNativePanelHandle() { |
return GetNativeHandle(); |
} |