Change Panel titlebars to activate the panel on click (rather than minimize).

chrome/browser/ui/panels/panel_window_controller_cocoa.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/panels/panel_window_controller_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"

[jianli, 2012/04/25 18:19:31]

Can be removed.

[jennb, 2012/04/25 20:34:05]

Done.

 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #include "chrome/browser/chrome_browser_application_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/menu_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util.h"
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
 #include "chrome/browser/ui/panels/panel_bounds_animation.h"
 #include "chrome/browser/ui/panels/panel_browser_window_cocoa.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"
 #import "chrome/browser/ui/panels/panel_utils_cocoa.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/common/chrome_notification_types.h"

[jianli, 2012/04/25 18:19:31]

ditto.

[jennb, 2012/04/25 20:34:05]

Done.

 #include "content/public/browser/notification_service.h"

[jianli, 2012/04/25 18:19:31]

ditto.

[jennb, 2012/04/25 20:34:05]

Done.

 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/mac/nsimage_cache.h"
 
 using content::WebContents;
 
 const int kMinimumWindowSize = 1;
@@ skipping 26 matching lines @@
 // The panels cannot be reduced to 3-px windows on the edge of the screen
 // active area (above Dock). Default constraining logic makes at least a height
 // of the titlebar visible, so the user could still grab it. We do 'restore'
 // differently, and minimize panels to 3 px. Hence the need to override the
 // constraining logic.
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen {
   return frameRect;
 }
 
 // Prevent panel window from becoming key - for example when it is minimized.
+// Panel windows use a higher priority NSWindowLevel to ensure they are always
+// visible, causing the OS to prefer panel windows when selecting a window
+// to make the key window. To counter this preference, we override
+// -[NSWindow:canBecomeKeyWindow] to restrict when the panel can become the
+// key window to a limited set of scenarios, such as when cycling through
+// windows, when panels are the only remaining windows, when an event
+// triggers window activation, etc. The panel may also be prevented from
+// becoming the key window, regardless of the above scenarios, such as when
+// a panel is minimized.
 - (BOOL)canBecomeKeyWindow {
   // Give precedence to controller preventing activation of the window.
   PanelWindowControllerCocoa* controller =
       base::mac::ObjCCast<PanelWindowControllerCocoa>([self windowController]);
   if (![controller canBecomeKeyWindow])
-    return false;
+    return NO;
 
   BrowserCrApplication* app = base::mac::ObjCCast<BrowserCrApplication>(
       [BrowserCrApplication sharedApplication]);
 
   // A Panel window can become the key window only in limited scenarios.
   // This prevents the system from always preferring a Panel window due
   // to its higher priority NSWindowLevel when selecting a window to make key.
-  return canBecomeKey_ ||
+  return ([app isHandlingSendEvent]  && [[app currentEvent] window] == self) ||

[jennb, 2012/04/24 18:47:15]

FYI: this change is the fix needed to prevent tabbed browser window from jumping
forward when clicking on a panel titlebar. It's needed because the system checks
-canBecomeKeyWindow when titlebar is clicked *before* we get
-NSWindow:sendEvent. Conveniently, this also eliminates the need for overriding
-sendEvent.

       [controller activationRequestedByBrowser] ||
       [app isCyclingWindows] ||
       [app previousKeyWindow] == self ||
       [[app windows] count] == static_cast<NSUInteger>([controller numPanels]);
 }
-
-- (void)sendEvent:(NSEvent*)anEvent {
-  // Allow the panel to become key in response to a mouse click.
-  AutoReset<BOOL> pin(&canBecomeKey_, YES);
-  [super sendEvent:anEvent];
-}
 @end
 
 // Transparent view covering the whole panel in order to intercept mouse
 // messages for custom user resizing. We need custom resizing because panels
 // use their own constrained layout.
 // TODO(dimich): Pull the start/stop drag logic into a separate base class and
 // reuse between here and PanelTitlebarController.
 @interface PanelResizeByMouseOverlay : NSView {
  @private
    Panel* panel_;
@@ skipping 729 matching lines @@
   [boundsAnimation_ release];
   boundsAnimation_ = nil;
 }
 
 - (BOOL)isAnimatingBounds {
   return boundsAnimation_ && [boundsAnimation_ isAnimating];
 }
 
 - (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 {
   NSView* titlebar = [self titlebarView];
   return NSHeight([titlebar convertRect:[titlebar bounds] toView:nil]);
 }
 
 - (int)titlebarIconOnlyWidthInScreenCoordinates {
   return [[self titlebarView] iconOnlyWidthInScreenCoordinates];
 }
@@ skipping 12 matching lines @@
   BrowserList::SetLastActive(windowShim_->browser());
 
   // We need to activate the controls (in the "WebView"). To do this, get the
   // selected WebContents's RenderWidgetHostView and tell it to activate.
   if (WebContents* contents = [contentsController_ webContents]) {
     if (content::RenderWidgetHostView* rwhv =
         contents->GetRenderWidgetHostView())
       rwhv->SetActive(true);
   }
 
-  // If the window becomes key, lets make sure it is expanded and stop
-  // drawing attention - since it is ready to accept input, it already has
-  // user's attention.
-  if ([[self titlebarView] isDrawingAttention]) {
-    [[self titlebarView] stopDrawingAttention];
-  }
-
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_PANEL_CHANGED_ACTIVE_STATUS,
-      content::Source<Panel>(windowShim_->panel()),
-      content::NotificationService::NoDetails());
-  windowShim_->panel()->OnActiveStateChanged();
+  windowShim_->panel()->OnActiveStateChanged(true);
 }
 
 - (void)windowDidResignKey:(NSNotification*)notification {
   // If our app is still active and we're still the key window, ignore this
   // message, since it just means that a menu extra (on the "system status bar")
   // was activated; we'll get another |-windowDidResignKey| if we ever really
   // lose key window status.
   if ([NSApp isActive] && ([NSApp keyWindow] == [self window]))
     return;
 
   // We need to deactivate the controls (in the "WebView"). To do this, get the
   // selected WebContents's RenderWidgetHostView and tell it to deactivate.
   if (WebContents* contents = [contentsController_ webContents]) {
     if (content::RenderWidgetHostView* rwhv =
         contents->GetRenderWidgetHostView())
       rwhv->SetActive(false);
   }
 
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_PANEL_CHANGED_ACTIVE_STATUS,
-      content::Source<Panel>(windowShim_->panel()),
-      content::NotificationService::NoDetails());
-  windowShim_->panel()->OnActiveStateChanged();
+  windowShim_->panel()->OnActiveStateChanged(false);
 }
 
 - (void)deactivate {
   if (![[self window] isMainWindow])
     return;
   BrowserWindow* browser_window =
       windowShim_->panel()->manager()->GetNextBrowserWindowToActivate(
           windowShim_->panel());
 
   if (browser_window)
@@ skipping 66 matching lines @@
   }
   [[self window] setLevel:NSDockWindowLevel];
 }
 
 - (void)enableResizeByMouse:(BOOL)enable {
   if (![self isWindowLoaded])
     return;
   [[self window] invalidateCursorRectsForView:overlayView_];
 }
 
-- (BOOL)isActivationByClickingTitlebarEnabled {
-  return !windowShim_->panel()->always_on_top();
-}
-
 @end