Make info button appear only when mouse is over the panel or the panel has focus.

chrome/browser/ui/panels/panel_browser_view_browsertest.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
 #include "chrome/browser/ui/panels/panel_browser_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/button/image_button.h"
-#include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
-#include "views/controls/menu/menu_2.h"
-
 
 class PanelBrowserViewTest : public InProcessBrowserTest {
  public:
   PanelBrowserViewTest() : InProcessBrowserTest() { }
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     command_line->AppendSwitch(switches::kEnablePanels);
   }
 
  protected:
+  class MockMouseWatcher : public PanelBrowserFrameView::MouseWatcher {
+   public:
+     explicit MockMouseWatcher(PanelBrowserFrameView* view)
+        : PanelBrowserFrameView::MouseWatcher(view),
+          cursor_in_view_(false) {

[Dmitry Titov, 2011/05/24 20:21:56]

Same: "is_cursor_in_view_"?

[jianli, 2011/05/24 21:58:56]

Done.

+     }
+
+     virtual bool IsCursorInViewBounds() const {
+       return cursor_in_view_;
+     }
+
+     void MoveMouse(bool cursor_in_view) {
+       cursor_in_view_ = cursor_in_view;
+
+#if defined(OS_WIN)
+        MSG msg;
+        msg.message = WM_MOUSEMOVE;
+        DidProcessMessage(msg);
+#else
+        GdkEvent event;
+        event.type = GDK_MOTION_NOTIFY;
+        DidProcessEvent(&event);
+#endif
+     }
+
+   private:
+    bool cursor_in_view_;
+  };
+
   PanelBrowserView* CreatePanelBrowserView(const std::string& panel_name) {
     Browser* panel_browser = Browser::CreateForApp(Browser::TYPE_PANEL,
                                                    panel_name,
                                                    gfx::Size(),
                                                    browser()->profile());
     panel_browser->window()->Show();
     return static_cast<PanelBrowserView*>(
         static_cast<Panel*>(panel_browser->window())->browser_window());
   }
 
-  void ValidateOptionsMenuItems(
-      ui::SimpleMenuModel* options_menu_contents, size_t count, int* ids) {
-    ASSERT_TRUE(options_menu_contents);
-    EXPECT_EQ(static_cast<int>(count), options_menu_contents->GetItemCount());
-    for (size_t i = 0; i < count; ++i) {
-      if (ids[i] == -1) {
-        EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR,
-                  options_menu_contents->GetTypeAt(i));
-      } else {
-        EXPECT_EQ(ids[i] , options_menu_contents->GetCommandIdAt(i));
-      }
-    }
-  }
-
   void ValidateDragging(PanelBrowserView** browser_views,
                         size_t num_browser_views,
                         size_t index_to_drag,
                         int delta_x,
                         int delta_y,
                         int* expected_delta_x_after_drag,
                         int* expected_delta_x_after_release,
                         bool cancel_dragging) {
     // Keep track of the initial bounds for comparison.
     scoped_array<gfx::Rect> initial_bounds(new gfx::Rect[num_browser_views]);
@@ skipping 84 matching lines @@
   // We should have icon, text, options button and close button.
   EXPECT_EQ(4, frame_view->child_count());
   EXPECT_TRUE(frame_view->Contains(frame_view->title_icon_));
   EXPECT_TRUE(frame_view->Contains(frame_view->title_label_));
   EXPECT_TRUE(frame_view->Contains(frame_view->info_button_));
   EXPECT_TRUE(frame_view->Contains(frame_view->close_button_));
 
   // These controls should be visible.
   EXPECT_TRUE(frame_view->title_icon_->IsVisible());
   EXPECT_TRUE(frame_view->title_label_->IsVisible());
-  EXPECT_TRUE(frame_view->info_button_->IsVisible());
   EXPECT_TRUE(frame_view->close_button_->IsVisible());
 
   // Validate their layouts.
   int title_bar_height = frame_view->NonClientTopBorderHeight() -
       frame_view->NonClientBorderThickness();
   EXPECT_GT(frame_view->title_icon_->width(), 0);
   EXPECT_GT(frame_view->title_icon_->height(), 0);
   EXPECT_LT(frame_view->title_icon_->height(), title_bar_height);
   EXPECT_GT(frame_view->title_label_->width(), 0);
   EXPECT_GT(frame_view->title_label_->height(), 0);
@@ skipping 14 matching lines @@
 
   // Validate that the controls should be updated when the activation state is
   // changed.
   frame_view->UpdateControlStyles(PanelBrowserFrameView::PAINT_AS_ACTIVE);
   gfx::Font title_label_font1 = frame_view->title_label_->font();
   frame_view->UpdateControlStyles(PanelBrowserFrameView::PAINT_AS_INACTIVE);
   gfx::Font title_label_font2 = frame_view->title_label_->font();
   EXPECT_NE(title_label_font1.GetStyle(), title_label_font2.GetStyle());
 }
 
+IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, ShowOrHideInfoButton) {

[Dmitry Titov, 2011/05/24 20:21:56]

I wonder if it can be a unit test. The benefit of the unit test is that they are
very fast because they don't need to launch a browser. I'm not sure how much
faster though. Do you know?

[jianli, 2011/05/24 21:58:56]

For this case, probably we need to use browser test since we  need to test it
when the panel is activated that needs to have the browser present.

+  PanelBrowserView* browser_view = CreatePanelBrowserView("PanelTest");
+  PanelBrowserFrameView* frame_view = browser_view->GetFrameView();
+
+  // Create and hook up the MockMouseWatcher so that we can simulate if the
+  // mouse is over the panel.
+  MockMouseWatcher* mouse_watcher = new MockMouseWatcher(frame_view);
+  frame_view->set_mouse_watcher(mouse_watcher);
+
+  // 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(browser_view->panel()->IsActive());
+
+  // When the panel is active, the info button should always be visible.
+  mouse_watcher->MoveMouse(true);
+  EXPECT_TRUE(frame_view->info_button_->IsVisible());
+  mouse_watcher->MoveMouse(false);
+  EXPECT_TRUE(frame_view->info_button_->IsVisible());
+
+  // When the panel is inactive, the info button is active per the mouse over
+  // the panel or not.
+  browser_view->panel()->Deactivate();
+  EXPECT_FALSE(browser_view->panel()->IsActive());
+
+  mouse_watcher->MoveMouse(true);
+  EXPECT_TRUE(frame_view->info_button_->IsVisible());
+  mouse_watcher->MoveMouse(false);
+  EXPECT_FALSE(frame_view->info_button_->IsVisible());
+}
+
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, TitleBarMouseEvent) {
   // TODO(jianli): Move the test to platform-independent PanelManager unittest.
 
   // Creates the 1st panel.
   PanelBrowserView* browser_view1 = CreatePanelBrowserView("PanelTest1");
 
   // The delta is from the pressed location which is the left-top corner of the
   // panel to drag.
   int small_negative_delta = -5;
   int small_positive_delta = 5;
@@ skipping 155 matching lines @@
                      false);
   }
 
   // Closes all panels.
   for (size_t i = 0; i < browser_view_count; ++i) {
     browser_views[i]->panel()->Close();
     EXPECT_FALSE(browser_views[i]->panel());
   }
 }
 #endif