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

Side by Side Diff: chrome/browser/apps/app_browsertest_util.cc

Issue 1807743003: Remove HostDesktopType from AppLaunchParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp-parent
Patch Set: fixes Created 4 years, 9 months 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
« no previous file with comments | « no previous file | chrome/browser/background/background_mode_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/apps/app_browsertest_util.h" 5 #include "chrome/browser/apps/app_browsertest_util.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 9 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
10 #include "chrome/browser/extensions/extension_function_test_utils.h" 10 #include "chrome/browser/extensions/extension_function_test_utils.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 const Extension* extension = InstallPlatformApp(name); 114 const Extension* extension = InstallPlatformApp(name);
115 115
116 LaunchPlatformApp(extension); 116 LaunchPlatformApp(extension);
117 117
118 app_loaded_observer.Wait(); 118 app_loaded_observer.Wait();
119 119
120 return extension; 120 return extension;
121 } 121 }
122 122
123 void PlatformAppBrowserTest::LaunchPlatformApp(const Extension* extension) { 123 void PlatformAppBrowserTest::LaunchPlatformApp(const Extension* extension) {
124 OpenApplication(AppLaunchParams(browser()->profile(), extension, 124 OpenApplication(CreateAppLaunchParamsUserContainer(
125 LAUNCH_CONTAINER_NONE, NEW_WINDOW, 125 browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW,
benwells 2016/03/16 22:50:12 Does this compile? I think it should stay as it ws
scottmg 2016/03/17 00:24:11 Thanks. I used cs.chromium.org to (attempt to) xre
126 extensions::SOURCE_TEST)); 126 extensions::SOURCE_TEST));
127 } 127 }
128 128
129 void PlatformAppBrowserTest::LaunchHostedApp(const Extension* extension) { 129 void PlatformAppBrowserTest::LaunchHostedApp(const Extension* extension) {
130 AppLaunchParams launch_params(browser()->profile(), extension, 130 AppLaunchParams launch_params(browser()->profile(), extension,
131 NEW_FOREGROUND_TAB, 131 NEW_FOREGROUND_TAB,
132 extensions::SOURCE_COMMAND_LINE); 132 extensions::SOURCE_COMMAND_LINE);
133 OpenApplication(launch_params); 133 OpenApplication(launch_params);
134 } 134 }
135 135
136 WebContents* PlatformAppBrowserTest::GetFirstAppWindowWebContents() { 136 WebContents* PlatformAppBrowserTest::GetFirstAppWindowWebContents() {
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 return app_window; 258 return app_window;
259 } 259 }
260 260
261 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine( 261 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine(
262 base::CommandLine* command_line) { 262 base::CommandLine* command_line) {
263 PlatformAppBrowserTest::SetUpCommandLine(command_line); 263 PlatformAppBrowserTest::SetUpCommandLine(command_line);
264 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); 264 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
265 } 265 }
266 266
267 } // namespace extensions 267 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/background/background_mode_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698