OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 #include "chrome/browser/translate/cld_data_harness.h" | 37 #include "chrome/browser/translate/cld_data_harness.h" |
38 #include "chrome/browser/translate/cld_data_harness_factory.h" | 38 #include "chrome/browser/translate/cld_data_harness_factory.h" |
39 #include "chrome/browser/ui/browser.h" | 39 #include "chrome/browser/ui/browser.h" |
40 #include "chrome/browser/ui/browser_command_controller.h" | 40 #include "chrome/browser/ui/browser_command_controller.h" |
41 #include "chrome/browser/ui/browser_commands.h" | 41 #include "chrome/browser/ui/browser_commands.h" |
42 #include "chrome/browser/ui/browser_finder.h" | 42 #include "chrome/browser/ui/browser_finder.h" |
43 #include "chrome/browser/ui/browser_iterator.h" | 43 #include "chrome/browser/ui/browser_iterator.h" |
44 #include "chrome/browser/ui/browser_tabstrip.h" | 44 #include "chrome/browser/ui/browser_tabstrip.h" |
45 #include "chrome/browser/ui/browser_ui_prefs.h" | 45 #include "chrome/browser/ui/browser_ui_prefs.h" |
46 #include "chrome/browser/ui/browser_window.h" | 46 #include "chrome/browser/ui/browser_window.h" |
| 47 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" |
| 48 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" |
47 #include "chrome/browser/ui/extensions/app_launch_params.h" | 49 #include "chrome/browser/ui/extensions/app_launch_params.h" |
48 #include "chrome/browser/ui/extensions/application_launch.h" | 50 #include "chrome/browser/ui/extensions/application_launch.h" |
49 #include "chrome/browser/ui/host_desktop.h" | 51 #include "chrome/browser/ui/host_desktop.h" |
50 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 52 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
51 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 53 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
52 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 54 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
53 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 55 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
54 #include "chrome/common/chrome_paths.h" | 56 #include "chrome/common/chrome_paths.h" |
55 #include "chrome/common/chrome_switches.h" | 57 #include "chrome/common/chrome_switches.h" |
56 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" | 58 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" |
(...skipping 3143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3200 ASCIIToUTF16("browser"), | 3202 ASCIIToUTF16("browser"), |
3201 browser()->tab_strip_model()->GetActiveWebContents()); | 3203 browser()->tab_strip_model()->GetActiveWebContents()); |
3202 | 3204 |
3203 Profile* profile = ProfileManager::GetActiveUserProfile(); | 3205 Profile* profile = ProfileManager::GetActiveUserProfile(); |
3204 ui_test_utils::BrowserAddedObserver browser_added_observer; | 3206 ui_test_utils::BrowserAddedObserver browser_added_observer; |
3205 Browser* app_browser = CreateBrowserForApp("blah", profile); | 3207 Browser* app_browser = CreateBrowserForApp("blah", profile); |
3206 browser_added_observer.WaitForSingleNewBrowser(); | 3208 browser_added_observer.WaitForSingleNewBrowser(); |
3207 auto app_contents = app_browser->tab_strip_model()->GetActiveWebContents(); | 3209 auto app_contents = app_browser->tab_strip_model()->GetActiveWebContents(); |
3208 CheckDisplayModeMQ(ASCIIToUTF16("standalone"), app_contents); | 3210 CheckDisplayModeMQ(ASCIIToUTF16("standalone"), app_contents); |
3209 | 3211 |
3210 app_browser->window()->EnterFullscreen( | 3212 app_browser->exclusive_access_manager()->context()->EnterFullscreen( |
3211 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, | 3213 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION, |
3212 false); | 3214 false); |
3213 | 3215 |
3214 // Sync navigation just to make sure IPC has passed (updated | 3216 // Sync navigation just to make sure IPC has passed (updated |
3215 // display mode is delivered to RP). | 3217 // display mode is delivered to RP). |
3216 content::TestNavigationObserver observer(app_contents, 1); | 3218 content::TestNavigationObserver observer(app_contents, 1); |
3217 ui_test_utils::NavigateToURL(app_browser, GURL(url::kAboutBlankURL)); | 3219 ui_test_utils::NavigateToURL(app_browser, GURL(url::kAboutBlankURL)); |
3218 observer.Wait(); | 3220 observer.Wait(); |
3219 | 3221 |
3220 CheckDisplayModeMQ(ASCIIToUTF16("fullscreen"), app_contents); | 3222 CheckDisplayModeMQ(ASCIIToUTF16("fullscreen"), app_contents); |
3221 } | 3223 } |
OLD | NEW |