| 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
| 10 #if defined(OS_MACOSX) | 10 #if defined(OS_MACOSX) |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "chrome/browser/profiles/profile_manager.h" | 25 #include "chrome/browser/profiles/profile_manager.h" |
| 26 #include "chrome/browser/translate/translate_tab_helper.h" | 26 #include "chrome/browser/translate/translate_tab_helper.h" |
| 27 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" | 27 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" |
| 28 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" | 28 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" |
| 29 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" | 29 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" |
| 30 #include "chrome/browser/ui/browser.h" | 30 #include "chrome/browser/ui/browser.h" |
| 31 #include "chrome/browser/ui/browser_finder.h" | 31 #include "chrome/browser/ui/browser_finder.h" |
| 32 #include "chrome/browser/ui/browser_list.h" | 32 #include "chrome/browser/ui/browser_list.h" |
| 33 #include "chrome/browser/ui/browser_navigator.h" | 33 #include "chrome/browser/ui/browser_navigator.h" |
| 34 #include "chrome/browser/ui/browser_window.h" | 34 #include "chrome/browser/ui/browser_window.h" |
| 35 #include "chrome/browser/ui/extensions/application_launch.h" |
| 35 #include "chrome/browser/ui/fullscreen_controller.h" | 36 #include "chrome/browser/ui/fullscreen_controller.h" |
| 36 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" | 37 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" |
| 37 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 38 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 38 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 39 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
| 39 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 40 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 40 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 41 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 41 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 42 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 42 #include "chrome/common/chrome_notification_types.h" | 43 #include "chrome/common/chrome_notification_types.h" |
| 43 #include "chrome/common/chrome_switches.h" | 44 #include "chrome/common/chrome_switches.h" |
| 44 #include "chrome/common/extensions/extension.h" | 45 #include "chrome/common/extensions/extension.h" |
| (...skipping 1271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1316 IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) { | 1317 IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) { |
| 1317 ASSERT_TRUE(test_server()->Start()); | 1318 ASSERT_TRUE(test_server()->Start()); |
| 1318 | 1319 |
| 1319 // Load an app | 1320 // Load an app |
| 1320 host_resolver()->AddRule("www.example.com", "127.0.0.1"); | 1321 host_resolver()->AddRule("www.example.com", "127.0.0.1"); |
| 1321 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); | 1322 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); |
| 1322 const Extension* extension_app = GetExtension(); | 1323 const Extension* extension_app = GetExtension(); |
| 1323 | 1324 |
| 1324 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. | 1325 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. |
| 1325 WebContents* app_window = | 1326 WebContents* app_window = |
| 1326 Browser::OpenApplication(browser()->profile(), | 1327 ApplicationLaunch::OpenApplication(browser()->profile(), |
| 1327 extension_app, | 1328 extension_app, |
| 1328 extension_misc::LAUNCH_WINDOW, | 1329 extension_misc::LAUNCH_WINDOW, |
| 1329 GURL(), | 1330 GURL(), |
| 1330 NEW_WINDOW); | 1331 NEW_WINDOW); |
| 1331 ASSERT_TRUE(app_window); | 1332 ASSERT_TRUE(app_window); |
| 1332 | 1333 |
| 1333 // Apps launched in a window from the NTP do not have extension_app set in | 1334 // Apps launched in a window from the NTP do not have extension_app set in |
| 1334 // tab contents. | 1335 // tab contents. |
| 1335 TabContentsWrapper* wrapper = | 1336 TabContentsWrapper* wrapper = |
| 1336 TabContentsWrapper::GetCurrentWrapperForContents(app_window); | 1337 TabContentsWrapper::GetCurrentWrapperForContents(app_window); |
| 1337 EXPECT_FALSE(wrapper->extension_tab_helper()->extension_app()); | 1338 EXPECT_FALSE(wrapper->extension_tab_helper()->extension_app()); |
| 1338 EXPECT_EQ(extension_app->GetFullLaunchURL(), app_window->GetURL()); | 1339 EXPECT_EQ(extension_app->GetFullLaunchURL(), app_window->GetURL()); |
| 1339 | 1340 |
| 1340 // The launch should have created a new browser. | 1341 // The launch should have created a new browser. |
| (...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1902 command_line->AppendSwitchASCII(switches::kApp, url.spec()); | 1903 command_line->AppendSwitchASCII(switches::kApp, url.spec()); |
| 1903 } | 1904 } |
| 1904 }; | 1905 }; |
| 1905 | 1906 |
| 1906 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { | 1907 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { |
| 1907 // Test that an application browser window loads correctly. | 1908 // Test that an application browser window loads correctly. |
| 1908 | 1909 |
| 1909 // Verify the browser is in application mode. | 1910 // Verify the browser is in application mode. |
| 1910 EXPECT_TRUE(browser()->IsApplication()); | 1911 EXPECT_TRUE(browser()->IsApplication()); |
| 1911 } | 1912 } |
| OLD | NEW |