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"
 #include "chrome/browser/ui/panels/panel_bounds_animation.h"
 #include "chrome/browser/ui/panels/panel_drag_gtk.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 
 using content::WebContents;
 
 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.
 const int kMinWindowWidth = 26;
 
 }  // namespace
 
@@ skipping 191 matching lines @@
   gdk_cairo_region(cr, dest_region);
 
   cairo_clip(cr);
   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.
+  bool is_active = IsActive();
+  if (!window() || was_active == is_active)  // State didn't change.
     return;
 
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_PANEL_CHANGED_ACTIVE_STATUS,
-      content::Source<Panel>(panel_.get()),
-      content::NotificationService::NoDetails());
-  panel_->OnActiveStateChanged();
+  panel_->OnActiveStateChanged(is_active);
 }
 
 BrowserWindowGtk::TitleDecoration PanelBrowserWindowGtk::GetWindowTitle(
     std::string* title) const {
   if (is_drawing_attention_) {
     std::string title_original;
     BrowserWindowGtk::TitleDecoration title_decoration =
         BrowserWindowGtk::GetWindowTitle(&title_original);
     DCHECK_EQ(BrowserWindowGtk::PLAIN_TEXT, title_decoration);
     gchar* title_escaped = g_markup_escape_text(title_original.c_str(), -1);
@@ skipping 300 matching lines @@
   rect.height = titlebar_allocation.height;
 
   return rect;
 }
 
 gboolean PanelBrowserWindowGtk::OnTitlebarButtonReleaseEvent(
     GtkWidget* widget, GdkEventButton* event) {
   if (event->button != 1)
     return TRUE;
 
-  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);
-
-  // Do not clear draw attention if user cannot see contents of panel.
-  if (!is_drawing_attention_ || panel_->IsMinimized())
-    return;
-
-  panel_->FlashFrame(false);
-
-  disableMinimizeUntilTime_ = base::Time::Now() +
-      base::TimeDelta::FromMilliseconds(kSuspendMinimizeOnClickIntervalMs);
-}
-
 // NativePanelTesting implementation.
 class NativePanelTestingGtk : public NativePanelTesting {
  public:
   explicit NativePanelTestingGtk(
       PanelBrowserWindowGtk* panel_browser_window_gtk);
 
  private:
   virtual void PressLeftMouseButtonTitlebar(
       const gfx::Point& mouse_location, panel::ClickModifier modifier) OVERRIDE;
   virtual void ReleaseMouseButtonTitlebar(
@@ skipping 104 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();
 }