OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/bookmarks/bookmark_utils.h" | 9 #include "chrome/browser/bookmarks/bookmark_utils.h" |
10 #include "chrome/browser/download/download_shelf.h" | 10 #include "chrome/browser/download/download_shelf.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 private: | 88 private: |
89 NSWindow* root_window_; | 89 NSWindow* root_window_; |
90 }; | 90 }; |
91 | 91 |
92 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { | 92 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { |
93 ASSERT_NO_FATAL_FAILURE(DoTest()); | 93 ASSERT_NO_FATAL_FAILURE(DoTest()); |
94 } | 94 } |
95 | 95 |
96 // Flaky on Mac: http://crbug.com/90557. | 96 // Flaky on Mac: http://crbug.com/90557. |
97 IN_PROC_BROWSER_TEST_F(ViewIDTest, FLAKY_Fullscreen) { | 97 IN_PROC_BROWSER_TEST_F(ViewIDTest, FLAKY_Fullscreen) { |
98 browser()->window()->SetFullscreen(true); | 98 browser()->window()->EnterFullscreen(GURL(), false); |
99 ASSERT_NO_FATAL_FAILURE(DoTest()); | 99 ASSERT_NO_FATAL_FAILURE(DoTest()); |
100 } | 100 } |
101 | 101 |
102 IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { | 102 IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { |
103 CheckViewID(VIEW_ID_TAB_0, true); | 103 CheckViewID(VIEW_ID_TAB_0, true); |
104 CheckViewID(VIEW_ID_TAB_LAST, true); | 104 CheckViewID(VIEW_ID_TAB_LAST, true); |
105 | 105 |
106 // Open 9 new tabs. | 106 // Open 9 new tabs. |
107 for (int i = 1; i <= 9; ++i) { | 107 for (int i = 1; i <= 9; ++i) { |
108 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false); | 108 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false); |
109 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), | 109 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), |
110 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED); | 110 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED); |
111 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); | 111 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); |
112 // VIEW_ID_TAB_LAST should always be available. | 112 // VIEW_ID_TAB_LAST should always be available. |
113 CheckViewID(VIEW_ID_TAB_LAST, true); | 113 CheckViewID(VIEW_ID_TAB_LAST, true); |
114 } | 114 } |
115 | 115 |
116 // Open the 11th tab. | 116 // Open the 11th tab. |
117 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), | 117 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), |
118 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED); | 118 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED); |
119 CheckViewID(VIEW_ID_TAB_LAST, true); | 119 CheckViewID(VIEW_ID_TAB_LAST, true); |
120 } | 120 } |
OLD | NEW |