| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" |
| 5 #include "base/logging.h" | 6 #include "base/logging.h" |
| 6 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/browser/bookmarks/bookmark_model.h" | 8 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 8 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
| 9 #include "chrome/browser/browser_window.h" | 10 #include "chrome/browser/browser_window.h" |
| 10 #include "chrome/browser/cocoa/view_id_util.h" | 11 #include "chrome/browser/cocoa/view_id_util.h" |
| 11 #include "chrome/browser/download/download_shelf.h" | 12 #include "chrome/browser/download/download_shelf.h" |
| 12 #include "chrome/browser/prefs/pref_service.h" | 13 #include "chrome/browser/prefs/pref_service.h" |
| 14 #include "chrome/browser/sidebar/sidebar_manager.h" |
| 15 #include "chrome/common/chrome_switches.h" |
| 13 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
| 14 #include "chrome/common/url_constants.h" | 17 #include "chrome/common/url_constants.h" |
| 15 #include "chrome/test/in_process_browser_test.h" | 18 #include "chrome/test/in_process_browser_test.h" |
| 16 #include "chrome/test/ui_test_utils.h" | 19 #include "chrome/test/ui_test_utils.h" |
| 17 | 20 |
| 18 // Basic sanity check of ViewID use on the mac. | 21 // Basic sanity check of ViewID use on the mac. |
| 19 class ViewIDTest : public InProcessBrowserTest { | 22 class ViewIDTest : public InProcessBrowserTest { |
| 20 public: | 23 public: |
| 21 ViewIDTest() : root_window_(nil) {} | 24 ViewIDTest() : root_window_(nil) { |
| 25 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 26 switches::kEnableExperimentalExtensionApis); |
| 27 } |
| 22 | 28 |
| 23 void CheckViewID(ViewID view_id, bool should_have) { | 29 void CheckViewID(ViewID view_id, bool should_have) { |
| 24 if (!root_window_) | 30 if (!root_window_) |
| 25 root_window_ = browser()->window()->GetNativeHandle(); | 31 root_window_ = browser()->window()->GetNativeHandle(); |
| 26 | 32 |
| 27 ASSERT_TRUE(root_window_); | 33 ASSERT_TRUE(root_window_); |
| 28 NSView* view = view_id_util::GetView(root_window_, view_id); | 34 NSView* view = view_id_util::GetView(root_window_, view_id); |
| 29 EXPECT_EQ(should_have, !!view) << " Failed id=" << view_id; | 35 EXPECT_EQ(should_have, !!view) << " Failed id=" << view_id; |
| 30 } | 36 } |
| 31 | 37 |
| 32 void DoTest() { | 38 void DoTest() { |
| 33 // Make sure FindBar is created to test | 39 // Make sure FindBar is created to test |
| 34 // VIEW_ID_FIND_IN_PAGE_TEXT_FIELD and VIEW_ID_FIND_IN_PAGE. | 40 // VIEW_ID_FIND_IN_PAGE_TEXT_FIELD and VIEW_ID_FIND_IN_PAGE. |
| 35 browser()->ShowFindBar(); | 41 browser()->ShowFindBar(); |
| 36 | 42 |
| 43 // Make sure sidebar is created to test VIEW_ID_SIDE_BAR_CONTAINER. |
| 44 const char sidebar_content_id[] = "test_content_id"; |
| 45 SidebarManager::GetInstance()->ShowSidebar( |
| 46 browser()->GetSelectedTabContents(), sidebar_content_id); |
| 47 SidebarManager::GetInstance()->ExpandSidebar( |
| 48 browser()->GetSelectedTabContents(), sidebar_content_id); |
| 49 |
| 37 // Make sure docked devtools is created to test VIEW_ID_DEV_TOOLS_DOCKED | 50 // Make sure docked devtools is created to test VIEW_ID_DEV_TOOLS_DOCKED |
| 38 browser()->profile()->GetPrefs()->SetBoolean(prefs::kDevToolsOpenDocked, | 51 browser()->profile()->GetPrefs()->SetBoolean(prefs::kDevToolsOpenDocked, |
| 39 true); | 52 true); |
| 40 browser()->ToggleDevToolsWindow(DEVTOOLS_TOGGLE_ACTION_INSPECT); | 53 browser()->ToggleDevToolsWindow(DEVTOOLS_TOGGLE_ACTION_INSPECT); |
| 41 | 54 |
| 42 // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF | 55 // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF |
| 43 browser()->window()->GetDownloadShelf()->Show(); | 56 browser()->window()->GetDownloadShelf()->Show(); |
| 44 | 57 |
| 45 // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT | 58 // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT |
| 46 BookmarkModel* bookmark_model = browser()->profile()->GetBookmarkModel(); | 59 BookmarkModel* bookmark_model = browser()->profile()->GetBookmarkModel(); |
| 47 if (bookmark_model) { | 60 if (bookmark_model) { |
| 48 if (!bookmark_model->IsLoaded()) | 61 if (!bookmark_model->IsLoaded()) |
| 49 ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model); | 62 ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model); |
| 50 | 63 |
| 51 bookmark_model->SetURLStarred(GURL(chrome::kAboutBlankURL), | 64 bookmark_model->SetURLStarred(GURL(chrome::kAboutBlankURL), |
| 52 UTF8ToUTF16("about"), true); | 65 UTF8ToUTF16("about"), true); |
| 53 } | 66 } |
| 54 | 67 |
| 55 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { | 68 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { |
| 56 // Mac implementation does not support following ids yet. | 69 // Mac implementation does not support following ids yet. |
| 57 if (i == VIEW_ID_STAR_BUTTON || | 70 if (i == VIEW_ID_STAR_BUTTON || |
| 58 i == VIEW_ID_AUTOCOMPLETE || | 71 i == VIEW_ID_AUTOCOMPLETE || |
| 59 i == VIEW_ID_CONTENTS_SPLIT || | 72 i == VIEW_ID_CONTENTS_SPLIT || |
| 60 i == VIEW_ID_SIDE_BAR_CONTAINER || | |
| 61 i == VIEW_ID_SIDE_BAR_SPLIT) { | 73 i == VIEW_ID_SIDE_BAR_SPLIT) { |
| 62 continue; | 74 continue; |
| 63 } | 75 } |
| 64 | 76 |
| 65 CheckViewID(static_cast<ViewID>(i), true); | 77 CheckViewID(static_cast<ViewID>(i), true); |
| 66 } | 78 } |
| 67 | 79 |
| 68 CheckViewID(VIEW_ID_TAB, true); | 80 CheckViewID(VIEW_ID_TAB, true); |
| 69 CheckViewID(VIEW_ID_TAB_STRIP, true); | 81 CheckViewID(VIEW_ID_TAB_STRIP, true); |
| 70 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); | 82 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); |
| 71 } | 83 } |
| 72 | 84 |
| 73 private: | 85 private: |
| 74 NSWindow* root_window_; | 86 NSWindow* root_window_; |
| 75 }; | 87 }; |
| 76 | 88 |
| 77 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { | 89 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { |
| 78 ASSERT_NO_FATAL_FAILURE(DoTest()); | 90 ASSERT_NO_FATAL_FAILURE(DoTest()); |
| 79 } | 91 } |
| 80 | 92 |
| 81 IN_PROC_BROWSER_TEST_F(ViewIDTest, FAILS_Fullscreen) { | 93 IN_PROC_BROWSER_TEST_F(ViewIDTest, Fullscreen) { |
| 82 browser()->window()->SetFullscreen(true); | 94 browser()->window()->SetFullscreen(true); |
| 83 ASSERT_NO_FATAL_FAILURE(DoTest()); | 95 ASSERT_NO_FATAL_FAILURE(DoTest()); |
| 84 } | 96 } |
| 85 | 97 |
| 86 IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { | 98 IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { |
| 87 CheckViewID(VIEW_ID_TAB_0, true); | 99 CheckViewID(VIEW_ID_TAB_0, true); |
| 88 CheckViewID(VIEW_ID_TAB_LAST, true); | 100 CheckViewID(VIEW_ID_TAB_LAST, true); |
| 89 | 101 |
| 90 // Open 9 new tabs. | 102 // Open 9 new tabs. |
| 91 for (int i = 1; i <= 9; ++i) { | 103 for (int i = 1; i <= 9; ++i) { |
| 92 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false); | 104 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false); |
| 93 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), | 105 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), |
| 94 NEW_BACKGROUND_TAB, PageTransition::TYPED); | 106 NEW_BACKGROUND_TAB, PageTransition::TYPED); |
| 95 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); | 107 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); |
| 96 // VIEW_ID_TAB_LAST should always be available. | 108 // VIEW_ID_TAB_LAST should always be available. |
| 97 CheckViewID(VIEW_ID_TAB_LAST, true); | 109 CheckViewID(VIEW_ID_TAB_LAST, true); |
| 98 } | 110 } |
| 99 | 111 |
| 100 // Open the 11th tab. | 112 // Open the 11th tab. |
| 101 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), | 113 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), |
| 102 NEW_BACKGROUND_TAB, PageTransition::TYPED); | 114 NEW_BACKGROUND_TAB, PageTransition::TYPED); |
| 103 CheckViewID(VIEW_ID_TAB_LAST, true); | 115 CheckViewID(VIEW_ID_TAB_LAST, true); |
| 104 } | 116 } |
| OLD | NEW |