Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(533)

Side by Side Diff: chrome/browser/ui/cocoa/view_id_util_browsertest.mm

Issue 789403002: Rename fullscreen_exit_bubble_* to exclusive_access_bubble_* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated based on CR comments Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/devtools/devtools_window_testing.h" 10 #include "chrome/browser/devtools/devtools_window_testing.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 NSWindow* root_window_; 90 NSWindow* root_window_;
91 }; 91 };
92 92
93 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { 93 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) {
94 ASSERT_NO_FATAL_FAILURE(DoTest()); 94 ASSERT_NO_FATAL_FAILURE(DoTest());
95 } 95 }
96 96
97 // Flaky on Mac: http://crbug.com/90557. 97 // Flaky on Mac: http://crbug.com/90557.
98 IN_PROC_BROWSER_TEST_F(ViewIDTest, DISABLED_Fullscreen) { 98 IN_PROC_BROWSER_TEST_F(ViewIDTest, DISABLED_Fullscreen) {
99 browser()->window()->EnterFullscreen( 99 browser()->window()->EnterFullscreen(
100 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, false); 100 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION,
101 false);
101 ASSERT_NO_FATAL_FAILURE(DoTest()); 102 ASSERT_NO_FATAL_FAILURE(DoTest());
102 } 103 }
103 104
104 IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { 105 IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) {
105 CheckViewID(VIEW_ID_TAB_0, true); 106 CheckViewID(VIEW_ID_TAB_0, true);
106 CheckViewID(VIEW_ID_TAB_LAST, true); 107 CheckViewID(VIEW_ID_TAB_LAST, true);
107 108
108 // Open 9 new tabs. 109 // Open 9 new tabs.
109 for (int i = 1; i <= 9; ++i) { 110 for (int i = 1; i <= 9; ++i) {
110 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false); 111 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false);
111 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), 112 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL),
112 Referrer(), 113 Referrer(),
113 NEW_BACKGROUND_TAB, 114 NEW_BACKGROUND_TAB,
114 ui::PAGE_TRANSITION_TYPED, 115 ui::PAGE_TRANSITION_TYPED,
115 false)); 116 false));
116 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); 117 CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true);
117 // VIEW_ID_TAB_LAST should always be available. 118 // VIEW_ID_TAB_LAST should always be available.
118 CheckViewID(VIEW_ID_TAB_LAST, true); 119 CheckViewID(VIEW_ID_TAB_LAST, true);
119 } 120 }
120 121
121 // Open the 11th tab. 122 // Open the 11th tab.
122 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), 123 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL),
123 Referrer(), 124 Referrer(),
124 NEW_BACKGROUND_TAB, 125 NEW_BACKGROUND_TAB,
125 ui::PAGE_TRANSITION_TYPED, 126 ui::PAGE_TRANSITION_TYPED,
126 false)); 127 false));
127 CheckViewID(VIEW_ID_TAB_LAST, true); 128 CheckViewID(VIEW_ID_TAB_LAST, true);
128 } 129 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/fullscreen_exit_bubble_view.mm ('k') | chrome/browser/ui/fullscreen/exclusive_access_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698