Remove wrench button from panel.

chrome/browser/ui/panels/panel_browser_view_browsertest.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 "base/i18n/time_formatting.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
@@ skipping 17 matching lines @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 class PanelBrowserViewTest : public BasePanelBrowserTest {
  public:
   PanelBrowserViewTest() : BasePanelBrowserTest() { }
 
  protected:
-  class MockMouseWatcher : public PanelBrowserFrameView::MouseWatcher {
-   public:
-    explicit MockMouseWatcher(PanelBrowserFrameView* view)
-        : PanelBrowserFrameView::MouseWatcher(view),
-          is_cursor_in_view_(false) {
-    }
-
-    virtual bool IsCursorInViewBounds() const {
-      return is_cursor_in_view_;
-    }
-
-    void MoveMouse(bool is_cursor_in_view) {
-      is_cursor_in_view_ = is_cursor_in_view;
-
-#if defined(OS_WIN)
-      MSG msg;
-      msg.message = WM_MOUSEMOVE;
-      DidProcessEvent(msg);
-#elif defined(USE_AURA)
-      NOTIMPLEMENTED();
-#elif defined(TOOLKIT_GTK)
-      GdkEvent event;
-      event.type = GDK_MOTION_NOTIFY;
-      DidProcessEvent(&event);
-#endif
-    }
-
-   private:
-    bool is_cursor_in_view_;
-  };
-
   PanelBrowserView* GetBrowserView(Panel* panel) const {
     return static_cast<PanelBrowserView*>(panel->native_panel());
   }
 
   gfx::Rect GetViewBounds(Panel* panel) const {
     return GetBrowserView(panel)->GetBounds();
   }
 
   void SetViewBounds(Panel* panel, const gfx::Rect& rect) const {
     return GetBrowserView(panel)->SetPanelBounds(rect);
   }
 
   gfx::NativeWindow GetNativeWindow(Panel* panel) const {
     return GetBrowserView(panel)->GetNativeHandle();
   }
 
   PanelBoundsAnimation* GetBoundsAnimator(Panel* panel) const {
     return GetBrowserView(panel)->bounds_animator_.get();
   }
 
-  ui::LinearAnimation* GetSettingsButtonAnimator(Panel* panel) const {
-    return GetBrowserView(panel)->GetFrameView()->
-        settings_button_animator_.get();
-  }
-
   int GetTitlebarHeight(Panel* panel) const {
     PanelBrowserFrameView* frame_view = GetBrowserView(panel)->GetFrameView();
     return frame_view->NonClientTopBorderHeight() -
            frame_view->NonClientBorderThickness();
   }
 
-  MockMouseWatcher* CreateTitlebarMouseWatcher(Panel* panel) {
-    PanelBrowserFrameView* frame_view = GetBrowserView(panel)->GetFrameView();
-    MockMouseWatcher* mouse_watcher = new MockMouseWatcher(frame_view);
-    frame_view->set_mouse_watcher(mouse_watcher);
-    return mouse_watcher;
-  }
-
   PanelBrowserFrameView::PaintState GetTitlebarPaintState(Panel* panel) const {
     return GetBrowserView(panel)->GetFrameView()->paint_state_;
   }
 
   bool IsTitlebarPaintedAsActive(Panel* panel) const {
     return GetTitlebarPaintState(panel) ==
            PanelBrowserFrameView::PAINT_AS_ACTIVE;
   }
 
   bool IsTitlebarPaintedAsInactive(Panel* panel) const {
@@ skipping 11 matching lines @@
   }
 
   TabIconView* GetTitleIcon(Panel* panel) const {
     return GetBrowserView(panel)->GetFrameView()->title_icon_;
   }
 
   views::Label* GetTitleText(Panel* panel) const {
     return GetBrowserView(panel)->GetFrameView()->title_label_;
   }
 
-  views::Button* GetSettingsButton(Panel* panel) const {
-    return GetBrowserView(panel)->GetFrameView()->settings_button_;
-  }
-
   views::Button* GetCloseButton(Panel* panel) const {
     return GetBrowserView(panel)->GetFrameView()->close_button_;
   }
 
   bool ContainsControl(Panel* panel, views::View* control) const {
     return GetBrowserView(panel)->GetFrameView()->Contains(control);
   }
 
   void WaitTillBoundsAnimationFinished(Panel* panel) {
     // The timer for the animation will only kick in as async task.
     while (GetBoundsAnimator(panel)->is_animating()) {
       MessageLoopForUI::current()->PostTask(FROM_HERE,
                                             MessageLoop::QuitClosure());
       MessageLoopForUI::current()->RunAllPending();
     }
   }
 
-  void WaitTillSettingsAnimationFinished(Panel* panel) {
-    // The timer for the animation will only kick in as async task.
-    while (GetSettingsButtonAnimator(panel)->is_animating()) {
-      MessageLoopForUI::current()->PostTask(FROM_HERE,
-                                            MessageLoop::QuitClosure());
-      MessageLoopForUI::current()->RunAllPending();
-    }
-  }
-
   void ClosePanelAndWaitForNotification(Panel* panel) {
     ui_test_utils::WindowedNotificationObserver signal(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::Source<Browser>(panel->browser()));
     panel->Close();
     signal.Wait();
   }
 
   // We put all the testing logic in this class instead of the test so that
   // we do not need to declare each new test as a friend of PanelBrowserView
@@ skipping 260 matching lines @@
 #endif
 
   panel->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, PanelLayout) {
   Panel* panel = CreatePanel("PanelTest");
 
   views::View* title_icon = GetTitleIcon(panel);
   views::View* title_text = GetTitleText(panel);
-  views::View* settings_button = GetSettingsButton(panel);
   views::View* close_button = GetCloseButton(panel);
 
   // We should have icon, text, settings button and close button.
-  EXPECT_EQ(4, GetControlCount(panel));
+  EXPECT_EQ(3, GetControlCount(panel));
   EXPECT_TRUE(ContainsControl(panel, title_icon));
   EXPECT_TRUE(ContainsControl(panel, title_text));
-  EXPECT_TRUE(ContainsControl(panel, settings_button));
   EXPECT_TRUE(ContainsControl(panel, close_button));
 
   // These controls should be visible.
   EXPECT_TRUE(title_icon->visible());
   EXPECT_TRUE(title_text->visible());
   EXPECT_TRUE(close_button->visible());
 
   // Validate their layouts.
   int titlebar_height = GetTitlebarHeight(panel);
   EXPECT_GT(title_icon->width(), 0);
   EXPECT_GT(title_icon->height(), 0);
   EXPECT_LT(title_icon->height(), titlebar_height);
   EXPECT_GT(title_text->width(), 0);
   EXPECT_GT(title_text->height(), 0);
   EXPECT_LT(title_text->height(), titlebar_height);
-  EXPECT_GT(settings_button->width(), 0);
-  EXPECT_GT(settings_button->height(), 0);
-  EXPECT_LT(settings_button->height(), titlebar_height);
   EXPECT_GT(close_button->width(), 0);
   EXPECT_GT(close_button->height(), 0);
   EXPECT_LT(close_button->height(), titlebar_height);
   EXPECT_LT(title_icon->x() + title_icon->width(), title_text->x());
-  EXPECT_LT(title_text->x() + title_text->width(), settings_button->x());
-  EXPECT_LT(settings_button->x() + settings_button->width(), close_button->x());
-}
-
-IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, ShowOrHideSettingsButton) {
-  Panel* panel = CreatePanel("PanelTest");
-  views::View* settings_button = GetSettingsButton(panel);
-
-  // Create and hook up the MockMouseWatcher so that we can simulate if the
-  // mouse is over the panel.
-  MockMouseWatcher* mouse_watcher = CreateTitlebarMouseWatcher(panel);
-
-  // When the panel is created, it is active. Since we cannot programatically
-  // bring the panel back to active state once it is deactivated, we have to
-  // test the cases that the panel is active first.
-  EXPECT_TRUE(panel->IsActive());
-
-  // When the panel is active, the settings button should always be visible.
-  mouse_watcher->MoveMouse(true);
-  EXPECT_TRUE(settings_button->visible());
-  mouse_watcher->MoveMouse(false);
-  EXPECT_TRUE(settings_button->visible());
-
-  // When the panel is inactive, the options button is active per the mouse over
-  // the panel or not.
-  panel->Deactivate();
-  EXPECT_FALSE(panel->IsActive());
-  WaitTillSettingsAnimationFinished(panel);
-  EXPECT_FALSE(settings_button->visible());
-
-  mouse_watcher->MoveMouse(true);
-  WaitTillSettingsAnimationFinished(panel);
-  EXPECT_TRUE(settings_button->visible());
-  mouse_watcher->MoveMouse(false);
-  WaitTillSettingsAnimationFinished(panel);
-  EXPECT_FALSE(settings_button->visible());
+  EXPECT_LT(title_text->x() + title_text->width(), close_button->x());
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, SetBoundsAnimation) {
   Panel* panel = CreatePanel("PanelTest");
   PanelBrowserView* browser_view = GetBrowserView(panel);
 
   // The bounds animation should not be triggered when the panel is up for the
   // first time.
   EXPECT_FALSE(GetBoundsAnimator(panel));
 
@@ skipping 29 matching lines @@
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest,
                        MinimizeAndRestoreOnAutoHideTaskBar) {
   TestMinimizeAndRestore(true);
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest,
                        ChangeAutoHideTaskBarThickness) {
   TestChangeAutoHideTaskBarThickness();
 }
 #endif