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

chrome/browser/ui/panels/panel_browser_window_gtk.cc

 // 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_browser_window_gtk.h"
 
 #include "base/bind.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/browser_titlebar.h"
 #include "chrome/browser/ui/panels/panel.h"
@@ skipping 10 matching lines @@
 namespace {
 
 // RGB values for titlebar in draw attention state. A shade of orange.
 const int kDrawAttentionR = 0xfa;
 const int kDrawAttentionG = 0x98;
 const int kDrawAttentionB = 0x3a;
 const float kDrawAttentionRFraction = kDrawAttentionR / 255.0;
 const float kDrawAttentionGFraction = kDrawAttentionG / 255.0;
 const float kDrawAttentionBFraction = kDrawAttentionB / 255.0;
 
-// Delay before click on a titlebar is allowed to minimize the panel after
-// the 'draw attention' mode has been cleared.
-const int kSuspendMinimizeOnClickIntervalMs = 500;
-
 // Markup for title text in draw attention state. Set to color white.
 const char* const kDrawAttentionTitleMarkupPrefix =
     "<span fgcolor='#ffffff'>";
 const char* const kDrawAttentionTitleMarkupSuffix = "</span>";
 
 // Set minimium width for window really small so it can be reduced to icon only
 // size in overflow expansion state.
 const int kMinWindowWidth = 2;
 
 }  // namespace
@@ skipping 200 matching lines @@
   cairo_paint(cr);
   gdk_region_destroy(dest_region);
 }
 
 void PanelBrowserWindowGtk::ActiveWindowChanged(GdkWindow* active_window) {
   bool was_active = IsActive();
   BrowserWindowGtk::ActiveWindowChanged(active_window);
   if (!window() || was_active == IsActive())  // State didn't change.
     return;
 
+  if (IsActive() && is_drawing_attention_) {
+    DCHECK(!panel_->IsMinimized());
+    panel_->FlashFrame(false);
+  }
+
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_ACTIVE_STATUS,
       content::Source<Panel>(panel_.get()),
       content::NotificationService::NoDetails());
 }
 
 BrowserWindowGtk::TitleDecoration PanelBrowserWindowGtk::GetWindowTitle(
     std::string* title) const {
   if (is_drawing_attention_) {
     std::string title_original;
@@ skipping 436 matching lines @@
 
 gboolean PanelBrowserWindowGtk::OnTitlebarButtonReleaseEvent(
     GtkWidget* widget, GdkEventButton* event) {
   if (event->button != 1) {
     DCHECK(!last_mouse_down_);
     return TRUE;
   }
 
   CleanupDragDrop();
 
-  if (event->state & GDK_CONTROL_MASK) {
-    panel_->OnTitlebarClicked(panel::APPLY_TO_ALL);
-    return TRUE;
-  }
-
-  // TODO(jennb): Move remaining titlebar click handling out of here.
-  // (http://crbug.com/118431)
-  PanelStrip* panel_strip = panel_->panel_strip();
-  if (!panel_strip)
-    return TRUE;
-
-  if (panel_strip->type() == PanelStrip::DOCKED &&
-      panel_->expansion_state() == Panel::EXPANDED) {
-    if (base::Time::Now() < disableMinimizeUntilTime_)
-      return TRUE;
-
-    panel_->SetExpansionState(Panel::MINIMIZED);
-  } else {
-    panel_->Activate();
-  }
-
+  panel_->OnTitlebarClicked((event->state & GDK_CONTROL_MASK) ?
+                            panel::APPLY_TO_ALL : panel::NO_MODIFIER);
   return TRUE;
 }
 
-void PanelBrowserWindowGtk::HandleFocusIn(GtkWidget* widget,
-                                          GdkEventFocus* event) {
-  BrowserWindowGtk::HandleFocusIn(widget, event);
-
-  if (!is_drawing_attention_)
-    return;
-
-  panel_->FlashFrame(false);
-  DCHECK(panel_->expansion_state() == Panel::EXPANDED);
-
-  disableMinimizeUntilTime_ = base::Time::Now() +
-      base::TimeDelta::FromMilliseconds(kSuspendMinimizeOnClickIntervalMs);
-}
-
 void PanelBrowserWindowGtk::OnDragBegin(GtkWidget* widget,
                                         GdkDragContext* context) {
   // Set drag icon to be a transparent pixbuf.
   GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
   gdk_pixbuf_fill(pixbuf, 0);
   gtk_drag_set_icon_pixbuf(context, pixbuf, 0, 0);
   g_object_unref(pixbuf);
 }
 
 gboolean PanelBrowserWindowGtk::OnDragFailed(
@@ skipping 131 matching lines @@
     MessageLoopForUI::current()->RunAllPending();
 }
 
 bool NativePanelTestingGtk::IsWindowSizeKnown() const {
   return !panel_browser_window_gtk_->frame_size_.IsEmpty();
 }
 
 bool NativePanelTestingGtk::IsAnimatingBounds() const {
   return panel_browser_window_gtk_->IsAnimatingBounds();
 }