Index: chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
index 5a97d7f37239776b823172d17f490cde9cbb2879..960cfb8dcfa50234a6d9eb1b16ab109a7962e7a6 100644 |
--- a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
+++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm |
@@ -862,29 +862,8 @@ enum { |
- (void)onTitlebarMouseClicked:(int)modifierFlags { |
Panel* panel = windowShim_->panel(); |
- if (modifierFlags & NSShiftKeyMask) { |
- panel->OnTitlebarClicked(panel::APPLY_TO_ALL); |
- return; |
- } |
- |
- // TODO(jennb): Move remaining titlebar click handling out of here. |
- // (http://crbug.com/118431) |
- PanelStrip* panelStrip = panel->panel_strip(); |
- if (!panelStrip) |
- return; |
- if (panelStrip->type() == PanelStrip::DOCKED && |
- panel->expansion_state() == Panel::EXPANDED) { |
- if ([[self titlebarView] isDrawingAttention]) { |
- // Do not minimize if the Panel is drawing attention since user |
- // most likely simply wants to reset the 'draw attention' status. |
- panel->Activate(); |
- return; |
- } |
- panel->SetExpansionState(Panel::MINIMIZED); |
- // The Panel class ensures deactivation when it is minimized. |
- } else { |
- panel->Activate(); |
- } |
+ panel->OnTitlebarClicked((modifierFlags & NSShiftKeyMask) ? |
+ panel::APPLY_TO_ALL : panel::NO_MODIFIER); |
} |
- (int)titlebarHeightInScreenCoordinates { |