OLD | NEW |
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" |
11 #include "chrome/browser/download/download_shelf.h" | 11 #include "chrome/browser/download/download_shelf.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/browser_commands.h" | 14 #include "chrome/browser/ui/browser_commands.h" |
15 #include "chrome/browser/ui/browser_window.h" | 15 #include "chrome/browser/ui/browser_window.h" |
16 #include "chrome/browser/ui/cocoa/view_id_util.h" | 16 #include "chrome/browser/ui/cocoa/view_id_util.h" |
| 17 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" |
| 18 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" |
17 #include "chrome/common/url_constants.h" | 19 #include "chrome/common/url_constants.h" |
18 #include "chrome/test/base/in_process_browser_test.h" | 20 #include "chrome/test/base/in_process_browser_test.h" |
19 #include "components/bookmarks/browser/bookmark_model.h" | 21 #include "components/bookmarks/browser/bookmark_model.h" |
20 #include "components/bookmarks/browser/bookmark_utils.h" | 22 #include "components/bookmarks/browser/bookmark_utils.h" |
21 #include "components/bookmarks/test/bookmark_test_helpers.h" | 23 #include "components/bookmarks/test/bookmark_test_helpers.h" |
22 #include "extensions/common/switches.h" | 24 #include "extensions/common/switches.h" |
23 | 25 |
24 using bookmarks::BookmarkModel; | 26 using bookmarks::BookmarkModel; |
25 using content::OpenURLParams; | 27 using content::OpenURLParams; |
26 using content::Referrer; | 28 using content::Referrer; |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 private: | 92 private: |
91 NSWindow* root_window_; | 93 NSWindow* root_window_; |
92 }; | 94 }; |
93 | 95 |
94 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { | 96 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { |
95 ASSERT_NO_FATAL_FAILURE(DoTest()); | 97 ASSERT_NO_FATAL_FAILURE(DoTest()); |
96 } | 98 } |
97 | 99 |
98 // Flaky on Mac: http://crbug.com/90557. | 100 // Flaky on Mac: http://crbug.com/90557. |
99 IN_PROC_BROWSER_TEST_F(ViewIDTest, DISABLED_Fullscreen) { | 101 IN_PROC_BROWSER_TEST_F(ViewIDTest, DISABLED_Fullscreen) { |
100 browser()->window()->EnterFullscreen( | 102 browser()->exclusive_access_manager()->context()->EnterFullscreen( |
101 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, | 103 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, |
102 false); | 104 false); |
103 ASSERT_NO_FATAL_FAILURE(DoTest()); | 105 ASSERT_NO_FATAL_FAILURE(DoTest()); |
104 } | 106 } |
105 | 107 |
106 IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { | 108 IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { |
107 CheckViewID(VIEW_ID_TAB_0, true); | 109 CheckViewID(VIEW_ID_TAB_0, true); |
108 CheckViewID(VIEW_ID_TAB_LAST, true); | 110 CheckViewID(VIEW_ID_TAB_LAST, true); |
109 | 111 |
110 // Open 9 new tabs. | 112 // Open 9 new tabs. |
(...skipping 10 matching lines...) Expand all Loading... |
121 } | 123 } |
122 | 124 |
123 // Open the 11th tab. | 125 // Open the 11th tab. |
124 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), | 126 browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), |
125 Referrer(), | 127 Referrer(), |
126 NEW_BACKGROUND_TAB, | 128 NEW_BACKGROUND_TAB, |
127 ui::PAGE_TRANSITION_TYPED, | 129 ui::PAGE_TRANSITION_TYPED, |
128 false)); | 130 false)); |
129 CheckViewID(VIEW_ID_TAB_LAST, true); | 131 CheckViewID(VIEW_ID_TAB_LAST, true); |
130 } | 132 } |
OLD | NEW |