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/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/bookmarks/bookmark_model.h" | 8 #include "chrome/browser/bookmarks/bookmark_model.h" |
9 #include "chrome/browser/download/download_shelf.h" | 9 #include "chrome/browser/download/download_shelf.h" |
10 #include "chrome/browser/prefs/pref_service.h" | 10 #include "chrome/browser/prefs/pref_service.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 ASSERT_TRUE(root_window_); | 34 ASSERT_TRUE(root_window_); |
35 NSView* view = view_id_util::GetView(root_window_, view_id); | 35 NSView* view = view_id_util::GetView(root_window_, view_id); |
36 EXPECT_EQ(should_have, !!view) << " Failed id=" << view_id; | 36 EXPECT_EQ(should_have, !!view) << " Failed id=" << view_id; |
37 } | 37 } |
38 | 38 |
39 void DoTest() { | 39 void DoTest() { |
40 // Make sure FindBar is created to test | 40 // Make sure FindBar is created to test |
41 // VIEW_ID_FIND_IN_PAGE_TEXT_FIELD and VIEW_ID_FIND_IN_PAGE. | 41 // VIEW_ID_FIND_IN_PAGE_TEXT_FIELD and VIEW_ID_FIND_IN_PAGE. |
42 browser()->ShowFindBar(); | 42 browser()->ShowFindBar(); |
43 | 43 |
44 // Make sure sidebar is created to test VIEW_ID_SIDE_BAR_CONTAINER. | 44 // Make sure sidebar is created to test VIEW_ID_SIDEBAR_CONTAINER. |
45 const char sidebar_content_id[] = "test_content_id"; | 45 const char sidebar_content_id[] = "test_content_id"; |
46 SidebarManager::GetInstance()->ShowSidebar( | 46 SidebarManager::GetInstance()->ShowSidebar( |
47 browser()->GetSelectedTabContents(), sidebar_content_id); | 47 browser()->GetSelectedTabContentsWrapper(), sidebar_content_id); |
48 SidebarManager::GetInstance()->ExpandSidebar( | 48 SidebarManager::GetInstance()->ExpandSidebar( |
49 browser()->GetSelectedTabContents(), sidebar_content_id); | 49 browser()->GetSelectedTabContentsWrapper(), sidebar_content_id); |
50 | 50 |
51 // Make sure docked devtools is created to test VIEW_ID_DEV_TOOLS_DOCKED | 51 // Make sure docked devtools is created to test VIEW_ID_DEV_TOOLS_DOCKED |
52 browser()->profile()->GetPrefs()->SetBoolean(prefs::kDevToolsOpenDocked, | 52 browser()->profile()->GetPrefs()->SetBoolean(prefs::kDevToolsOpenDocked, |
53 true); | 53 true); |
54 browser()->ToggleDevToolsWindow(DEVTOOLS_TOGGLE_ACTION_INSPECT); | 54 browser()->ToggleDevToolsWindow(DEVTOOLS_TOGGLE_ACTION_INSPECT); |
55 | 55 |
56 // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF | 56 // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF |
57 browser()->window()->GetDownloadShelf()->Show(); | 57 browser()->window()->GetDownloadShelf()->Show(); |
58 | 58 |
59 // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT | 59 // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT |
60 BookmarkModel* bookmark_model = browser()->profile()->GetBookmarkModel(); | 60 BookmarkModel* bookmark_model = browser()->profile()->GetBookmarkModel(); |
61 if (bookmark_model) { | 61 if (bookmark_model) { |
62 if (!bookmark_model->IsLoaded()) | 62 if (!bookmark_model->IsLoaded()) |
63 ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model); | 63 ui_test_utils::WaitForBookmarkModelToLoad(bookmark_model); |
64 | 64 |
65 bookmark_model->SetURLStarred(GURL(chrome::kAboutBlankURL), | 65 bookmark_model->SetURLStarred(GURL(chrome::kAboutBlankURL), |
66 UTF8ToUTF16("about"), true); | 66 UTF8ToUTF16("about"), true); |
67 } | 67 } |
68 | 68 |
69 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { | 69 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { |
70 // Mac implementation does not support following ids yet. | 70 // Mac implementation does not support following ids yet. |
71 if (i == VIEW_ID_STAR_BUTTON || | 71 if (i == VIEW_ID_STAR_BUTTON || |
72 i == VIEW_ID_AUTOCOMPLETE || | 72 i == VIEW_ID_AUTOCOMPLETE || |
73 i == VIEW_ID_CONTENTS_SPLIT || | 73 i == VIEW_ID_CONTENTS_SPLIT || |
74 i == VIEW_ID_SIDE_BAR_SPLIT || | 74 i == VIEW_ID_SIDEBAR_SPLIT || |
| 75 i == VIEW_ID_SIDEBAR_TAB || |
| 76 i == VIEW_ID_SIDEBAR_TAB_STRIP || |
75 i == VIEW_ID_FEEDBACK_BUTTON) { | 77 i == VIEW_ID_FEEDBACK_BUTTON) { |
76 continue; | 78 continue; |
77 } | 79 } |
78 | 80 |
79 CheckViewID(static_cast<ViewID>(i), true); | 81 CheckViewID(static_cast<ViewID>(i), true); |
80 } | 82 } |
81 | 83 |
82 CheckViewID(VIEW_ID_TAB, true); | 84 CheckViewID(VIEW_ID_TAB, true); |
83 CheckViewID(VIEW_ID_TAB_STRIP, true); | 85 CheckViewID(VIEW_ID_TAB_STRIP, true); |
84 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); | 86 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); |
(...skipping 24 matching lines...) Expand all Loading... |
109 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); | 111 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); |
110 // VIEW_ID_TAB_LAST should always be available. | 112 // VIEW_ID_TAB_LAST should always be available. |
111 CheckViewID(VIEW_ID_TAB_LAST, true); | 113 CheckViewID(VIEW_ID_TAB_LAST, true); |
112 } | 114 } |
113 | 115 |
114 // Open the 11th tab. | 116 // Open the 11th tab. |
115 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), | 117 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), |
116 NEW_BACKGROUND_TAB, PageTransition::TYPED); | 118 NEW_BACKGROUND_TAB, PageTransition::TYPED); |
117 CheckViewID(VIEW_ID_TAB_LAST, true); | 119 CheckViewID(VIEW_ID_TAB_LAST, true); |
118 } | 120 } |
OLD | NEW |