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

Unified Diff: chrome/browser/apps/app_browsertest.cc

Issue 106713002: Move LaunchContainer enum to extension_constants.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/apps/app_browsertest_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/app_browsertest.cc
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index f2c1ab522bb8ccce46bd7c3c1076c6acfe7d19f3..6b536fc02be5a0ca7571ecd64b01d1e555738dd9 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -522,8 +522,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, LaunchWithRelativeFile) {
ASSERT_TRUE(extension);
// Run the test
- AppLaunchParams params(browser()->profile(), extension, LAUNCH_NONE,
- NEW_WINDOW);
+ AppLaunchParams params(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW);
params.command_line = CommandLine::ForCurrentProcess();
params.current_directory = test_data_dir_;
OpenApplication(params);
@@ -843,8 +843,8 @@ void PlatformAppDevToolsBrowserTest::RunTestWithDevTools(
content::WindowedNotificationObserver app_loaded_observer(
content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
content::NotificationService::AllSources());
- OpenApplication(AppLaunchParams(browser()->profile(), extension,
- LAUNCH_NONE, NEW_WINDOW));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW));
app_loaded_observer.Wait();
window = GetFirstShellWindow();
ASSERT_TRUE(window);
@@ -986,8 +986,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
ASSERT_TRUE(should_install.seen());
ExtensionTestMessageListener launched_listener("Launched", false);
- OpenApplication(AppLaunchParams(browser()->profile(), extension, LAUNCH_NONE,
- NEW_WINDOW));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW));
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
}
@@ -1009,8 +1009,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
ASSERT_TRUE(extension);
ExtensionTestMessageListener launched_listener("Launched", false);
- OpenApplication(AppLaunchParams(browser()->profile(), extension, LAUNCH_NONE,
- NEW_WINDOW));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW));
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
ASSERT_FALSE(should_not_install.seen());
@@ -1048,8 +1048,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ComponentAppBackgroundPage) {
ASSERT_TRUE(should_install.seen());
ExtensionTestMessageListener launched_listener("Launched", false);
- OpenApplication(AppLaunchParams(browser()->profile(), extension, LAUNCH_NONE,
- NEW_WINDOW));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW));
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
}
« no previous file with comments | « no previous file | chrome/browser/apps/app_browsertest_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698