diff options
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 65 | ||||
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.h | 33 | ||||
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view_test.cc | 857 |
3 files changed, 934 insertions, 21 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index e9dbb11..6579a0f 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -235,7 +235,13 @@ class BookmarkButton : public ChromeViews::TextButton { url_(url), profile_(profile) { show_animation_.reset(new SlideAnimation(this)); - show_animation_->Show(); + if (BookmarkBarView::testing_) { + // For some reason during testing the events generated by animating + // throw off the test. So, don't animate while testing. + show_animation_->Reset(1); + } else { + show_animation_->Show(); + } } bool GetTooltipText(int x, int y, std::wstring* tooltip) { @@ -507,6 +513,8 @@ class BookmarkNodeMenuController : public ChromeViews::MenuDelegate, menu_.Cancel(); } + MenuItemView* menu() { return &menu_; } + private: // Menu::Delegate method. Does the appropriate operation based on chosen // menu item. @@ -750,6 +758,12 @@ class MenuRunner : public ChromeViews::MenuDelegate, menu_.Cancel(); } + MenuItemView* menu() { return &menu_; } + + MenuItemView* context_menu() { + return context_menu_.get() ? context_menu_->menu() : NULL; + } + private: // Creates an entry in menu for each child node of parent starting at // start_child_index, recursively invoking this for any star groups. @@ -980,6 +994,9 @@ class ButtonSeparatorView : public ChromeViews::View { // static const int BookmarkBarView::kMaxButtonWidth = 150; +// static +bool BookmarkBarView::testing_ = false; + // Returns the bitmap to use for starred groups. static const SkBitmap& GetGroupIcon() { if (!kFolderIcon) { @@ -1444,24 +1461,38 @@ bool BookmarkBarView::IsAlwaysShown() { } bool BookmarkBarView::IsNewTabPage() { - DCHECK(browser_); - - if (browser_->GetSelectedTabContents()) { - return browser_->GetSelectedTabContents()->IsBookmarkBarAlwaysVisible(); - } - - return false; + return (browser_ && browser_->GetSelectedTabContents() && + browser_->GetSelectedTabContents()->IsBookmarkBarAlwaysVisible()); } void BookmarkBarView::AnimationProgressed(const Animation* animation) { - browser_->ToolbarSizeChanged(NULL, true); + if (browser_) + browser_->ToolbarSizeChanged(NULL, true); } void BookmarkBarView::AnimationEnded(const Animation* animation) { - browser_->ToolbarSizeChanged(NULL, false); + if (browser_) + browser_->ToolbarSizeChanged(NULL, false); SchedulePaint(); } +ChromeViews::TextButton* BookmarkBarView::GetBookmarkButton(int index) { + DCHECK(index >= 0 && index < GetBookmarkButtonCount()); + return static_cast<ChromeViews::TextButton*>(GetChildViewAt(index)); +} + +ChromeViews::MenuItemView* BookmarkBarView::GetMenu() { + return menu_runner_.get() ? menu_runner_->menu() : NULL; +} + +ChromeViews::MenuItemView* BookmarkBarView::GetContextMenu() { + return menu_runner_.get() ? menu_runner_->context_menu() : NULL; +} + +ChromeViews::MenuItemView* BookmarkBarView::GetDropMenu() { + return drop_menu_runner_.get() ? drop_menu_runner_->menu() : NULL; +} + void BookmarkBarView::Init() { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); @@ -1525,11 +1556,6 @@ int BookmarkBarView::GetBookmarkButtonCount() { return GetChildViewCount() - 4; } -ChromeViews::TextButton* BookmarkBarView::GetBookmarkButton(int index) { - DCHECK(index >= 0 && index < GetBookmarkButtonCount()); - return static_cast<ChromeViews::TextButton*>(GetChildViewAt(index)); -} - void BookmarkBarView::Loaded(BookmarkBarModel* model) { BookmarkBarNode* node = model_->GetBookmarkBarNode(); DCHECK(node && model_->other_node()); @@ -1722,8 +1748,7 @@ void BookmarkBarView::RunMenu(ChromeViews::View* view, CPoint screen_loc(x, 0); View::ConvertPointToScreen(this, &screen_loc); menu_runner_.reset(new MenuRunner(this, node, start_index)); - HWND parent_hwnd = reinterpret_cast<HWND>( - browser_->window()->GetPlatformID()); + HWND parent_hwnd = GetViewContainer()->GetHWND(); menu_runner_->RunMenuAt(parent_hwnd, gfx::Rect(screen_loc.x, screen_loc.y, view->GetWidth(), height), @@ -1914,6 +1939,12 @@ void BookmarkBarView::StopShowFolderDropMenuTimer() { } void BookmarkBarView::StartShowFolderDropMenuTimer(BookmarkBarNode* node) { + if (testing_) { + // So that tests can run as fast as possible disable the delay during + // testing. + ShowDropFolderForNode(node); + return; + } DCHECK(!show_folder_drop_menu_task_); show_folder_drop_menu_task_ = new ShowFolderDropMenuTask(this, node); static DWORD delay = 0; diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h index b8ffa37..287f8d7 100644 --- a/chrome/browser/views/bookmark_bar_view.h +++ b/chrome/browser/views/bookmark_bar_view.h @@ -52,6 +52,10 @@ class ButtonSeparatorView; struct DropInfo; } +namespace ChromeViews { +class MenuItemView; +} + // BookmarkBarView renders the BookmarkBarModel. Each starred entry // on the BookmarkBar is rendered as a MenuButton. An additional // MenuButton aligned to the right allows the user to quickly see @@ -143,9 +147,33 @@ class BookmarkBarView : public ChromeViews::View, void AnimationProgressed(const Animation* animation); void AnimationEnded(const Animation* animation); + // Returns the button at the specified index. + ChromeViews::TextButton* GetBookmarkButton(int index); + + // Returns the button responsible for showing bookmarks in the other bookmark + // folder. + ChromeViews::TextButton* other_bookmarked_button() const { + return other_bookmarked_button_; + } + + // Returns the active MenuItemView, or NULL if a menu isn't showing. + ChromeViews::MenuItemView* GetMenu(); + + // Returns the drop MenuItemView, or NULL if a menu isn't showing. + ChromeViews::MenuItemView* GetDropMenu(); + + // Returns the context menu, or null if one isn't showing. + ChromeViews::MenuItemView* GetContextMenu(); + + // Returns the button used when not all the items on the bookmark bar fit. + ChromeViews::TextButton* overflow_button() const { return overflow_button_; } + // Maximum size of buttons on the bookmark bar. static const int kMaxButtonWidth; + // If true we're running tests. This short circuits a couple of animations. + static bool testing_; + private: // Task that invokes ShowDropFolderForNode when run. ShowFolderDropMenuTask // deletes itself once run. @@ -192,9 +220,6 @@ class BookmarkBarView : public ChromeViews::View, // bookmark bar model has. int GetBookmarkButtonCount(); - // Returns the button at the specified index. - ChromeViews::TextButton* GetBookmarkButton(int index); - // Invoked when the bookmark bar model has finished loading. Creates a button // for each of the children of the root node from the model. virtual void Loaded(BookmarkBarModel* model); @@ -404,7 +429,7 @@ class BookmarkBarView : public ChromeViews::View, ButtonSeparatorView* bookmarks_separator_view_; - // Owning browser. + // Owning browser. This is NULL duing testing. Browser* browser_; // Animation controlling showing and hiding of the bar. diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc new file mode 100644 index 0000000..a2a84e7 --- /dev/null +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -0,0 +1,857 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "base/string_util.h" +#include "chrome/browser/automation/ui_controls.h" +#include "chrome/browser/bookmark_bar_model.h" +#include "chrome/browser/page_navigator.h" +#include "chrome/browser/profile.h" +#include "chrome/browser/views/bookmark_bar_view.h" +#include "chrome/common/pref_names.h" +#include "chrome/common/pref_service.h" +#include "chrome/test/testing_profile.h" +#include "chrome/test/ui/view_event_test_base.h" +#include "chrome/views/chrome_menu.h" +#include "chrome/views/text_button.h" + +namespace { + +// PageNavigator implementation that records the URL. +class TestingPageNavigator : public PageNavigator { + public: + virtual void OpenURL(const GURL& url, + WindowOpenDisposition disposition, + PageTransition::Type transition) { + url_ = url; + } + + GURL url_; +}; + +} // namespace + +// Base class for event generating bookmark view tests. These test are intended +// to exercise ChromeMenus, but that's easier done with BookmarkBarView rather +// than ChromeMenu itself. +// +// SetUp creates a bookmark model with the following structure. +// All folders are in upper case, all URLs in lower case. +// F1 +// f1a +// F11 +// f11a +// * +// a +// b +// c +// d +// OTHER +// oa +// OF +// ofa +// ofb +// OF2 +// of2a +// of2b +// +// * if CreateBigMenu returns return true, 100 menu items are created here with +// the names f1-f100. +// +// Subclasses should be sure and invoke super's implementation of SetUp and +// TearDown. +class BookmarkBarViewEventTestBase : public ViewEventTestBase { + public: + BookmarkBarViewEventTestBase() + : ViewEventTestBase(), bb_view_(NULL), model_(NULL) { + } + + virtual void SetUp() { + ChromeViews::MenuItemView::allow_task_nesting_during_run_ = true; + BookmarkBarView::testing_ = true; + + profile_.reset(new TestingProfile()); + profile_->set_has_history_service(true); + profile_->CreateBookmarkBarModel(); + profile_->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true); + + model_ = profile_->GetBookmarkBarModel(); + + bb_view_ = new BookmarkBarView(profile_.get(), NULL); + bb_view_->SetPageNavigator(&navigator_); + + AddTestData(CreateBigMenu()); + + // Calculate the preferred size so that one button doesn't fit, which + // triggers the overflow button to appear. + // + // BookmarkBarView::Layout does nothing if the parent is NULL and + // GetPreferredSize hard codes a width of 1. For that reason we add the + // BookmarkBarView to a dumby view as the parent. + // + // This code looks a bit hacky, but I've written it so that it shouldn't + // be dependant upon any of the layout code in BookmarkBarView. Instead + // we brute force search for a size that triggers the overflow button. + ChromeViews::View tmp_parent; + + tmp_parent.AddChildView(bb_view_); + + CSize bb_view_pref; + bb_view_->GetPreferredSize(&bb_view_pref); + bb_view_pref_.set_width(1000); + bb_view_pref_.set_height(bb_view_pref.cy); + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(4); + while (button->IsVisible()) { + bb_view_pref_.set_width(bb_view_pref_.width() - 25); + bb_view_->SetBounds(0, 0, bb_view_pref_.width(), bb_view_pref_.height()); + bb_view_->Layout(); + } + + tmp_parent.RemoveChildView(bb_view_); + + ViewEventTestBase::SetUp(); + } + + virtual void TearDown() { + BookmarkBarView::testing_ = false; + ChromeViews::MenuItemView::allow_task_nesting_during_run_ = false; + ViewEventTestBase::TearDown(); + } + + protected: + virtual ChromeViews::View* CreateContentsView() { + return bb_view_; + } + + virtual gfx::Size GetPreferredSize() { return bb_view_pref_; } + + // See comment above class description for what this does. + virtual bool CreateBigMenu() { return false; } + + BookmarkBarModel* model_; + BookmarkBarView* bb_view_; + TestingPageNavigator navigator_; + + private: + void AddTestData(bool big_menu) { + std::string test_base = "file:///c:/tmp/"; + + BookmarkBarNode* f1 = + model_->AddGroup(model_->GetBookmarkBarNode(), 0, L"F1"); + model_->AddURL(f1, 0, L"f1a", GURL(test_base + "f1a")); + BookmarkBarNode* f11 = model_->AddGroup(f1, 1, L"F11"); + model_->AddURL(f11, 0, L"f11a", GURL(test_base + "f11a")); + if (big_menu) { + for (int i = 1; i <= 100; ++i) { + model_->AddURL(f1, i + 1, L"f" + IntToWString(i), + GURL(test_base + "f" + IntToString(i))); + } + } + model_->AddURL(model_->GetBookmarkBarNode(), 1, L"a", + GURL(test_base + "a")); + model_->AddURL(model_->GetBookmarkBarNode(), 2, L"b", + GURL(test_base + "b")); + model_->AddURL(model_->GetBookmarkBarNode(), 3, L"c", + GURL(test_base + "c")); + model_->AddURL(model_->GetBookmarkBarNode(), 4, L"d", + GURL(test_base + "d")); + model_->AddURL(model_->other_node(), 0, L"oa", GURL(test_base + "oa")); + BookmarkBarNode* of = model_->AddGroup(model_->other_node(), 1, L"OF"); + model_->AddURL(of, 0, L"ofa", GURL(test_base + "ofa")); + model_->AddURL(of, 1, L"ofb", GURL(test_base + "ofb")); + BookmarkBarNode* of2 = model_->AddGroup(model_->other_node(), 2, L"OF2"); + model_->AddURL(of2, 0, L"of2a", GURL(test_base + "of2a")); + model_->AddURL(of2, 1, L"of2b", GURL(test_base + "of2b")); + } + + gfx::Size bb_view_pref_; + scoped_ptr<TestingProfile> profile_; +}; + +// Clicks on first menu, makes sure button is depressed. Moves mouse to first +// child, clicks it and makes sure a navigation occurs. +class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase { + protected: + virtual void DoTestOnMessageLoop() { + // Move the mouse to the first folder on the bookmark bar and press the + // mouse. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest1::Step2)); + } + + private: + void Step2() { + // Menu should be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + + // Button should be depressed. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + ASSERT_TRUE(button->GetState() == ChromeViews::BaseButton::BS_PUSHED); + + // Click on the 2nd menu item (A URL). + ASSERT_TRUE(menu->GetSubmenu()); + + ChromeViews::MenuItemView* menu_to_select = + menu->GetSubmenu()->GetMenuItemAt(0); + ui_controls::MoveMouseToCenterAndPress(menu_to_select, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest1::Step3)); + } + + void Step3() { + // We should have navigated to URL f1a. + ASSERT_TRUE(navigator_.url_ == + model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)-> + GetURL()); + + // Make sure button is no longer pushed. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + ASSERT_TRUE(button->GetState() == ChromeViews::BaseButton::BS_NORMAL); + + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu == NULL || !menu->GetSubmenu()->IsShowing()); + + Done(); + } +}; + +VIEW_TEST(BookmarkBarViewTest1, Basic) + +// Brings up menu, clicks on empty space and make sure menu hides. +class BookmarkBarViewTest2 : public BookmarkBarViewEventTestBase { + protected: + virtual void DoTestOnMessageLoop() { + // Move the mouse to the first folder on the bookmark bar and press the + // mouse. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest2::Step2)); + } + + private: + void Step2() { + // Menu should be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL && menu->GetSubmenu()->IsShowing()); + + // Click on 0x0, which should trigger closing menu. + // NOTE: this code assume there is a left margin, which is currently + // true. If that changes, this code will need to find another empty space + // to press the mouse on. + CPoint mouse_loc(0, 0); + ChromeViews::View::ConvertPointToScreen(bb_view_, &mouse_loc); + ui_controls::SendMouseMove(0, 0); + ui_controls::SendMouseEventsNotifyWhenDone( + ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest2::Step3)); + } + + void Step3() { + // The menu shouldn't be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu == NULL || !menu->GetSubmenu()->IsShowing()); + + // Make sure button is no longer pushed. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + ASSERT_TRUE(button->GetState() == ChromeViews::BaseButton::BS_NORMAL); + + window_->Activate(); + + Done(); + } +}; + +VIEW_TEST(BookmarkBarViewTest2, HideOnDesktopClick) + +// Brings up menu. Moves over child to make sure submenu appears, moves over +// another child and make sure next menu appears. +class BookmarkBarViewTest3 : public BookmarkBarViewEventTestBase { + protected: + virtual void DoTestOnMessageLoop() { + // Move the mouse to the first folder on the bookmark bar and press the + // mouse. + ChromeViews::TextButton* button = bb_view_->other_bookmarked_button(); + ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest3::Step2)); + } + + private: + void Step2() { + // Menu should be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + + ChromeViews::MenuItemView* child_menu = + menu->GetSubmenu()->GetMenuItemAt(1); + ASSERT_TRUE(child_menu != NULL); + + // Click on second child, which has a submenu. + ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest3::Step3)); + } + + void Step3() { + // Make sure sub menu is showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ChromeViews::MenuItemView* child_menu = + menu->GetSubmenu()->GetMenuItemAt(1); + ASSERT_TRUE(child_menu->GetSubmenu() != NULL); + ASSERT_TRUE(child_menu->GetSubmenu()->IsShowing()); + + // Click on third child, which has a submenu too. + child_menu = menu->GetSubmenu()->GetMenuItemAt(2); + ASSERT_TRUE(child_menu != NULL); + ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest3::Step4)); + } + + void Step4() { + // Make sure sub menu we first clicked isn't showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ChromeViews::MenuItemView* child_menu = + menu->GetSubmenu()->GetMenuItemAt(1); + ASSERT_TRUE(child_menu->GetSubmenu() != NULL); + ASSERT_FALSE(child_menu->GetSubmenu()->IsShowing()); + + // And submenu we last clicked is showing. + child_menu = menu->GetSubmenu()->GetMenuItemAt(2); + ASSERT_TRUE(child_menu != NULL); + ASSERT_TRUE(child_menu->GetSubmenu()->IsShowing()); + + // Nothing should have been selected. + ASSERT_TRUE(navigator_.url_ == GURL()); + + // Hide menu. + menu->GetMenuController()->Cancel(true); + + // Because of the nested loop run by the menu we need to invoke done twice. + Done(); + Done(); + } +}; + +VIEW_TEST(BookmarkBarViewTest3, Submenus) + +// Tests context menus by way of opening a context menu for a bookmark, +// then right clicking to get context menu and selecting the first menu item +// (open). +class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase { + protected: + virtual void DoTestOnMessageLoop() { + // Move the mouse to the first folder on the bookmark bar and press the + // mouse. + ChromeViews::TextButton* button = bb_view_->other_bookmarked_button(); + ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest4::Step2)); + } + + private: + void Step2() { + // Menu should be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + + ChromeViews::MenuItemView* child_menu = + menu->GetSubmenu()->GetMenuItemAt(0); + ASSERT_TRUE(child_menu != NULL); + + // Right click on the first child to get its context menu. + ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest4::Step3)); + } + + void Step3() { + // Make sure the context menu is showing. + ChromeViews::MenuItemView* menu = bb_view_->GetContextMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + + // Select the first menu item (open). + ui_controls::MoveMouseToCenterAndPress(menu->GetSubmenu()->GetMenuItemAt(0), + ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest4::Step4)); + } + + void Step4() { + ASSERT_TRUE(navigator_.url_ == + model_->other_node()->GetChild(0)->GetURL()); + + // Because of the nested loop we invoke done twice here. + Done(); + Done(); + } +}; + +VIEW_TEST(BookmarkBarViewTest4, ContextMenus) + +// Tests drag and drop within the same menu. +class BookmarkBarViewTest5 : public BookmarkBarViewEventTestBase { + protected: + virtual void DoTestOnMessageLoop() { + url_dragging_ = + model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->GetURL(); + + // Move the mouse to the first folder on the bookmark bar and press the + // mouse. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest5::Step2)); + } + + private: + void Step2() { + // Menu should be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + + ChromeViews::MenuItemView* child_menu = + menu->GetSubmenu()->GetMenuItemAt(0); + ASSERT_TRUE(child_menu != NULL); + + // Move mouse to center of menu and press button. + ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT, + ui_controls::DOWN, + CreateEventTask(this, &BookmarkBarViewTest5::Step3)); + } + + void Step3() { + ChromeViews::MenuItemView* target_menu = + bb_view_->GetMenu()->GetSubmenu()->GetMenuItemAt(1); + CPoint loc(1, target_menu->GetHeight() - 1); + ChromeViews::View::ConvertPointToScreen(target_menu, &loc); + + // Start a drag. + ui_controls::SendMouseMoveNotifyWhenDone(loc.x + 10, loc.y, + CreateEventTask(this, &BookmarkBarViewTest5::Step4)); + + // See comment above this method as to why we do this. + ScheduleMouseMoveInBackground(loc.x, loc.y); + } + + void Step4() { + // Drop the item so that it's now the second item. + ChromeViews::MenuItemView* target_menu = + bb_view_->GetMenu()->GetSubmenu()->GetMenuItemAt(1); + CPoint loc(1, target_menu->GetHeight() - 1); + ChromeViews::View::ConvertPointToScreen(target_menu, &loc); + ui_controls::SendMouseMove(loc.x, loc.y); + + ui_controls::SendMouseEventsNotifyWhenDone(ui_controls::LEFT, + ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest5::Step5)); + } + + void Step5() { + GURL url = model_->GetBookmarkBarNode()->GetChild(0)->GetChild(1)->GetURL(); + ASSERT_TRUE(url == url_dragging_); + Done(); + } + + GURL url_dragging_; +}; + +VIEW_TEST(BookmarkBarViewTest5, DND) + +// Tests holding mouse down on overflow button, dragging such that menu pops up +// then selecting an item. +class BookmarkBarViewTest6 : public BookmarkBarViewEventTestBase { + protected: + virtual void DoTestOnMessageLoop() { + // Press the mouse button on the overflow button. Don't release it though. + ChromeViews::TextButton* button = bb_view_->overflow_button(); + ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT, + ui_controls::DOWN, CreateEventTask(this, &BookmarkBarViewTest6::Step2)); + } + + private: + void Step2() { + // Menu should be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + + ChromeViews::MenuItemView* child_menu = + menu->GetSubmenu()->GetMenuItemAt(0); + ASSERT_TRUE(child_menu != NULL); + + // Move mouse to center of menu and release mouse. + ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT, + ui_controls::UP, CreateEventTask(this, &BookmarkBarViewTest6::Step3)); + } + + void Step3() { + ASSERT_TRUE(navigator_.url_ == + model_->GetBookmarkBarNode()->GetChild(4)->GetURL()); + Done(); + } + + GURL url_dragging_; +}; + +VIEW_TEST(BookmarkBarViewTest6, OpenMenuOnClickAndHold) + +// Tests drag and drop to different menu. +class BookmarkBarViewTest7 : public BookmarkBarViewEventTestBase { + protected: + virtual void DoTestOnMessageLoop() { + url_dragging_ = + model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->GetURL(); + + // Move the mouse to the first folder on the bookmark bar and press the + // mouse. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest7::Step2)); + } + + private: + void Step2() { + // Menu should be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + + ChromeViews::MenuItemView* child_menu = + menu->GetSubmenu()->GetMenuItemAt(0); + ASSERT_TRUE(child_menu != NULL); + + // Move mouse to center of menu and press button. + ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT, + ui_controls::DOWN, + CreateEventTask(this, &BookmarkBarViewTest7::Step3)); + } + + void Step3() { + // Drag over other button. + ChromeViews::TextButton* other_button = + bb_view_->other_bookmarked_button(); + CPoint loc(other_button->GetWidth() / 2, other_button->GetHeight() / 2); + ChromeViews::View::ConvertPointToScreen(other_button, &loc); + + // Start a drag. + ui_controls::SendMouseMoveNotifyWhenDone(loc.x + 10, loc.y, + NewRunnableMethod(this, &BookmarkBarViewTest7::Step4)); + + // See comment above this method as to why we do this. + ScheduleMouseMoveInBackground(loc.x, loc.y); + } + + void Step4() { + ChromeViews::MenuItemView* drop_menu = bb_view_->GetDropMenu(); + ASSERT_TRUE(drop_menu != NULL); + ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing()); + + ChromeViews::MenuItemView* target_menu = + drop_menu->GetSubmenu()->GetMenuItemAt(0); + CPoint loc(1, 1); + ChromeViews::View::ConvertPointToScreen(target_menu, &loc); + ui_controls::SendMouseMove(loc.x, loc.y); + ui_controls::SendMouseEventsNotifyWhenDone( + ui_controls::LEFT, ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest7::Step5)); + } + + void Step5() { + ASSERT_TRUE(model_->other_node()->GetChild(0)->GetURL() == url_dragging_); + Done(); + } + + GURL url_dragging_; +}; + +VIEW_TEST(BookmarkBarViewTest7, DNDToDifferentMenu) + +// Drags from one menu to next so that original menu closes, then back to +// original menu. +class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase { + protected: + virtual void DoTestOnMessageLoop() { + url_dragging_ = + model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->GetURL(); + + // Move the mouse to the first folder on the bookmark bar and press the + // mouse. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest8::Step2)); + } + + private: + void Step2() { + // Menu should be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + + ChromeViews::MenuItemView* child_menu = + menu->GetSubmenu()->GetMenuItemAt(0); + ASSERT_TRUE(child_menu != NULL); + + // Move mouse to center of menu and press button. + ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::LEFT, + ui_controls::DOWN, + CreateEventTask(this, &BookmarkBarViewTest8::Step3)); + } + + void Step3() { + // Drag over other button. + ChromeViews::TextButton* other_button = + bb_view_->other_bookmarked_button(); + CPoint loc(other_button->GetWidth() / 2, other_button->GetHeight() / 2); + ChromeViews::View::ConvertPointToScreen(other_button, &loc); + + // Start a drag. + ui_controls::SendMouseMoveNotifyWhenDone(loc.x + 10, loc.y, + NewRunnableMethod(this, &BookmarkBarViewTest8::Step4)); + + // See comment above this method as to why we do this. + ScheduleMouseMoveInBackground(loc.x, loc.y); + } + + void Step4() { + ChromeViews::MenuItemView* drop_menu = bb_view_->GetDropMenu(); + ASSERT_TRUE(drop_menu != NULL); + ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing()); + + // Now drag back over first menu. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + CPoint loc(button->GetWidth() / 2, button->GetHeight() / 2); + ChromeViews::View::ConvertPointToScreen(button, &loc); + ui_controls::SendMouseMoveNotifyWhenDone(loc.x, loc.y, + NewRunnableMethod(this, &BookmarkBarViewTest8::Step5)); + } + + void Step5() { + // Drop on folder F11. + ChromeViews::MenuItemView* drop_menu = bb_view_->GetDropMenu(); + ASSERT_TRUE(drop_menu != NULL); + ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing()); + + ChromeViews::MenuItemView* target_menu = + drop_menu->GetSubmenu()->GetMenuItemAt(1); + ui_controls::MoveMouseToCenterAndPress( + target_menu, ui_controls::LEFT, ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest8::Step6)); + } + + void Step6() { + // Make sure drop was processed. + GURL final_url = model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)-> + GetChild(1)->GetURL(); + ASSERT_TRUE(final_url == url_dragging_); + Done(); + } + + GURL url_dragging_; +}; + +VIEW_TEST(BookmarkBarViewTest8, DNDBackToOriginatingMenu) + +// Moves the mouse over the scroll button and makes sure we get scrolling. +class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase { + protected: + virtual bool CreateBigMenu() { return true; } + + virtual void DoTestOnMessageLoop() { + // Move the mouse to the first folder on the bookmark bar and press the + // mouse. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest9::Step2)); + } + + private: + void Step2() { + // Menu should be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + + first_menu_ = menu->GetSubmenu()->GetMenuItemAt(0); + CPoint menu_loc; + ChromeViews::View::ConvertPointToScreen(first_menu_, &menu_loc); + start_y_ = menu_loc.y; + + // Move the mouse over the scroll button. + ChromeViews::View* scroll_container = menu->GetSubmenu()->GetParent(); + ASSERT_TRUE(scroll_container != NULL); + scroll_container = scroll_container->GetParent(); + ASSERT_TRUE(scroll_container != NULL); + ChromeViews::View* scroll_down_button = scroll_container->GetChildViewAt(1); + ASSERT_TRUE(scroll_down_button); + CPoint loc(scroll_down_button->GetWidth() / 2, + scroll_down_button->GetHeight() / 2); + ChromeViews::View::ConvertPointToScreen(scroll_down_button, &loc); + ui_controls::SendMouseMoveNotifyWhenDone( + loc.x, loc.y, CreateEventTask(this, &BookmarkBarViewTest9::Step3)); + } + + void Step3() { + MessageLoop::current()->PostDelayedTask(FROM_HERE, + NewRunnableMethod(this, &BookmarkBarViewTest9::Step4), 200); + } + + void Step4() { + CPoint menu_loc; + ChromeViews::View::ConvertPointToScreen(first_menu_, &menu_loc); + ASSERT_NE(start_y_, menu_loc.y); + + // Hide menu. + bb_view_->GetMenu()->GetMenuController()->Cancel(true); + + Done(); + } + + int start_y_; + ChromeViews::MenuItemView* first_menu_; +}; + +VIEW_TEST(BookmarkBarViewTest9, ScrollButtonScrolls) + +// Tests up/down/left/enter key messages. +class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase { + protected: + virtual void DoTestOnMessageLoop() { + // Move the mouse to the first folder on the bookmark bar and press the + // mouse. + ChromeViews::TextButton* button = bb_view_->GetBookmarkButton(0); + ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT, + ui_controls::DOWN | ui_controls::UP, + CreateEventTask(this, &BookmarkBarViewTest10::Step2)); + } + + private: + void Step2() { + // Menu should be showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + + // Send a down event, which should select the first item. + ui_controls::SendKeyPressNotifyWhenDone( + VK_DOWN, false, false, false, + CreateEventTask(this, &BookmarkBarViewTest10::Step3)); + } + + void Step3() { + // Make sure menu is showing and item is selected. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + ASSERT_TRUE(menu->GetSubmenu()->GetMenuItemAt(0)->IsSelected()); + + // Send a key down event, which should select the next item. + ui_controls::SendKeyPressNotifyWhenDone( + VK_DOWN, false, false, false, + CreateEventTask(this, &BookmarkBarViewTest10::Step4)); + } + + void Step4() { + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + ASSERT_FALSE(menu->GetSubmenu()->GetMenuItemAt(0)->IsSelected()); + ASSERT_TRUE(menu->GetSubmenu()->GetMenuItemAt(1)->IsSelected()); + + // Send a right arrow to force the menu to open. + ui_controls::SendKeyPressNotifyWhenDone( + VK_RIGHT, false, false, false, + CreateEventTask(this, &BookmarkBarViewTest10::Step5)); + } + + void Step5() { + // Make sure the submenu is showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + ChromeViews::MenuItemView* submenu = menu->GetSubmenu()->GetMenuItemAt(1); + ASSERT_TRUE(submenu->IsSelected()); + ASSERT_TRUE(submenu->GetSubmenu()); + ASSERT_TRUE(submenu->GetSubmenu()->IsShowing()); + + // Send a left arrow to close the submenu. + ui_controls::SendKeyPressNotifyWhenDone( + VK_LEFT, false, false, false, + CreateEventTask(this, &BookmarkBarViewTest10::Step6)); + } + + void Step6() { + // Make sure the submenu is showing. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + ChromeViews::MenuItemView* submenu = menu->GetSubmenu()->GetMenuItemAt(1); + ASSERT_TRUE(submenu->IsSelected()); + ASSERT_TRUE(!submenu->GetSubmenu() || !submenu->GetSubmenu()->IsShowing()); + + // Send a down arrow to wrap back to f1a + ui_controls::SendKeyPressNotifyWhenDone( + VK_DOWN, false, false, false, + CreateEventTask(this, &BookmarkBarViewTest10::Step7)); + } + + void Step7() { + // Make sure menu is showing and item is selected. + ChromeViews::MenuItemView* menu = bb_view_->GetMenu(); + ASSERT_TRUE(menu != NULL); + ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); + ASSERT_TRUE(menu->GetSubmenu()->GetMenuItemAt(0)->IsSelected()); + + // Send enter, which should select the item. + ui_controls::SendKeyPressNotifyWhenDone( + VK_RETURN, false, false, false, + CreateEventTask(this, &BookmarkBarViewTest10::Step8)); + } + + void Step8() { + ASSERT_TRUE( + model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->GetURL() == + navigator_.url_); + Done(); + } +}; + +VIEW_TEST(BookmarkBarViewTest10, KeyEvents) |