Remove wrench button from panel.

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/browser/ui/panels/panel_settings_menu_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 
 using content::WebContents;
 
 namespace {
 
 // RGB values for titlebar in draw attention state. A shade of orange.
 const int kDrawAttentionR = 0xfa;
@@ skipping 30 matching lines @@
                                              Panel* panel,
                                              const gfx::Rect& bounds)
     : BrowserWindowGtk(browser),
       system_drag_disabled_for_testing_(false),
       last_mouse_down_(NULL),
       drag_widget_(NULL),
       drag_end_factory_(this),
       panel_(panel),
       bounds_(bounds),
       is_drawing_attention_(false),
-      window_has_mouse_(false),
       show_close_button_(true) {
 }
 
 PanelBrowserWindowGtk::~PanelBrowserWindowGtk() {
   CleanupDragDrop();
 }
 
 void PanelBrowserWindowGtk::Init() {
   BrowserWindowGtk::Init();
 
   // Keep the window always on top.
   gtk_window_set_keep_above(window(), TRUE);
 
   // Show the window on all the virtual desktops.
   gtk_window_stick(window());
 
   // Do not show an icon in the task bar.  Window operations such as close,
   // minimize etc. can only be done from the panel UI.
   gtk_window_set_skip_taskbar_hint(window(), TRUE);
 
   g_signal_connect(titlebar_widget(), "button-press-event",
                    G_CALLBACK(OnTitlebarButtonPressEventThunk), this);
   g_signal_connect(titlebar_widget(), "button-release-event",
                    G_CALLBACK(OnTitlebarButtonReleaseEventThunk), this);
 
-  g_signal_connect(window_, "enter-notify-event",
-                   G_CALLBACK(OnEnterNotifyThunk), this);
-  g_signal_connect(window_, "leave-notify-event",
-                   G_CALLBACK(OnLeaveNotifyThunk), this);
-
   registrar_.Add(
       this,
       chrome::NOTIFICATION_PANEL_CHANGED_LAYOUT_MODE,
       content::Source<Panel>(panel_.get()));
   registrar_.Add(
       this,
       chrome::NOTIFICATION_WINDOW_CLOSED,
       content::Source<GtkWindow>(window()));
 }
 
@@ skipping 103 matching lines @@
       chrome::NOTIFICATION_PANEL_WINDOW_SIZE_KNOWN,
       content::Source<Panel>(panel_.get()),
       content::NotificationService::NoDetails());
 }
 
 bool PanelBrowserWindowGtk::UseCustomFrame() {
   // We always use custom frame for panels.
   return TRUE;
 }
 
-void PanelBrowserWindowGtk::ShowSettingsMenu(GtkWidget* widget,
-                                             GdkEventButton* event) {
-  if (!settings_menu_.get()) {
-    settings_menu_model_.reset(new PanelSettingsMenuModel(panel_.get()));
-    settings_menu_.reset(new MenuGtk(this, settings_menu_model_.get()));
-  }
-  settings_menu_->PopupForWidget(widget, event->button, event->time);
-}
-
 void PanelBrowserWindowGtk::DrawPopupFrame(cairo_t* cr,
                                            GtkWidget* widget,
                                            GdkEventExpose* event) {
   BrowserWindowGtk::DrawPopupFrame(cr, widget, event);
 
   if (is_drawing_attention_)
     DrawAttentionFrame(cr, widget, event);
 }
 
 void PanelBrowserWindowGtk::DrawCustomFrame(cairo_t* cr,
@@ skipping 22 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;
 
-  PanelStrip* panel_strip = panel_->panel_strip();
-  if (panel_strip) {
-    if ((IsActive() || window_has_mouse_) &&
-        panel_strip->type() != PanelStrip::IN_OVERFLOW) {
-      titlebar()->ShowPanelWrenchButton();
-    } else {
-      titlebar()->HidePanelWrenchButton();
-    }
-  }
-
   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 506 matching lines @@
   // drag-end).  We post a task, instead of calling EndDrag right here, to give
   // GTK+ a chance to send the drag-failed event with the right status.  If
   // GTK+ does send the drag-failed event, we cancel the task.
   MessageLoop::current()->PostTask(FROM_HERE,
       base::Bind(&PanelBrowserWindowGtk::EndDrag,
                  drag_end_factory_.GetWeakPtr(),
                  false));
   return TRUE;
 }
 
-gboolean PanelBrowserWindowGtk::OnEnterNotify(GtkWidget* widget,
-                                              GdkEventCrossing* event) {
-  // Ignore if entered from a child widget.
-  if (event->detail == GDK_NOTIFY_INFERIOR)
-    return FALSE;
-
-  PanelStrip* panel_strip = panel_->panel_strip();
-  if (!panel_strip)
-    return FALSE;
-
-  if (window() && panel_strip->type() != PanelStrip::IN_OVERFLOW)
-    titlebar()->ShowPanelWrenchButton();
-
-  window_has_mouse_ = true;
-  return FALSE;
-}
-
-gboolean PanelBrowserWindowGtk::OnLeaveNotify(GtkWidget* widget,
-                                              GdkEventCrossing* event) {
-  // Ignore if left towards a child widget.
-  if (event->detail == GDK_NOTIFY_INFERIOR)
-    return FALSE;
-
-  if (window_ && !IsActive())
-    titlebar()->HidePanelWrenchButton();
-
-  window_has_mouse_ = false;
-  return FALSE;
-}
-
 // 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 99 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();
 }