Index: chrome/browser/ui/panels/panel.cc |
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc |
index 8e08f364448f60eccb174968c11a378eb89bc606..fe405d396a267dca198ef3504cb958e0a2f146c3 100644 |
--- a/chrome/browser/ui/panels/panel.cc |
+++ b/chrome/browser/ui/panels/panel.cc |
@@ -157,6 +157,9 @@ void Panel::MoveToStrip(PanelStrip* new_strip) { |
panel_strip_ = new_strip; |
panel_strip_->AddPanel(this); |
+ native_panel_->PreventActivationByOS(panel_strip_->TreatAllPanelsAsMinimized() |
+ || expansion_state_ != EXPANDED); |
+ |
content::NotificationService::current()->Notify( |
chrome::NOTIFICATION_PANEL_CHANGED_LAYOUT_MODE, |
content::Source<Panel>(this), |
@@ -175,6 +178,9 @@ void Panel::SetExpansionState(ExpansionState new_state) { |
if (expansion_state_ == MINIMIZED) |
Deactivate(); |
+ native_panel_->PreventActivationByOS(panel_strip_->TreatAllPanelsAsMinimized() |
+ || expansion_state_ != EXPANDED); |
+ |
content::NotificationService::current()->Notify( |
chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE, |
content::Source<Panel>(this), |