Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2268)

Unified Diff: chrome/browser/ui/panels/panel_browser_window_gtk.cc

Issue 9463022: Minimized panels should not open on Windows when activated by the OS (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: removed unnecessary include Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();
}
« no previous file with comments | « chrome/browser/ui/panels/panel_browser_window_gtk.h ('k') | chrome/browser/ui/panels/panel_window_controller_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698