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

Side by Side Diff: cloud_print/service/win/chrome_launcher.cc

Issue 317203004: Removed --disable-background-mode/restore-background-contents flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed deprecated command line switch from cloud_print Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "cloud_print/service/win/chrome_launcher.h" 5 #include "cloud_print/service/win/chrome_launcher.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 CommandLine cmd(chrome_path); 202 CommandLine cmd(chrome_path);
203 CopyChromeSwitchesFromCurrentProcess(&cmd); 203 CopyChromeSwitchesFromCurrentProcess(&cmd);
204 204
205 // Required switches. 205 // Required switches.
206 cmd.AppendSwitchASCII(switches::kProcessType, switches::kServiceProcess); 206 cmd.AppendSwitchASCII(switches::kProcessType, switches::kServiceProcess);
207 cmd.AppendSwitchPath(switches::kUserDataDir, user_data_); 207 cmd.AppendSwitchPath(switches::kUserDataDir, user_data_);
208 cmd.AppendSwitch(switches::kNoServiceAutorun); 208 cmd.AppendSwitch(switches::kNoServiceAutorun);
209 209
210 // Optional. 210 // Optional.
211 cmd.AppendSwitch(switches::kAutoLaunchAtStartup); 211 cmd.AppendSwitch(switches::kAutoLaunchAtStartup);
212 cmd.AppendSwitch(switches::kDisableBackgroundMode);
213 cmd.AppendSwitch(switches::kDisableDefaultApps); 212 cmd.AppendSwitch(switches::kDisableDefaultApps);
214 cmd.AppendSwitch(switches::kDisableExtensions); 213 cmd.AppendSwitch(switches::kDisableExtensions);
215 cmd.AppendSwitch(switches::kDisableGpu); 214 cmd.AppendSwitch(switches::kDisableGpu);
216 cmd.AppendSwitch(switches::kDisableSoftwareRasterizer); 215 cmd.AppendSwitch(switches::kDisableSoftwareRasterizer);
217 cmd.AppendSwitch(switches::kDisableSync); 216 cmd.AppendSwitch(switches::kDisableSync);
218 cmd.AppendSwitch(switches::kNoFirstRun); 217 cmd.AppendSwitch(switches::kNoFirstRun);
219 cmd.AppendSwitch(switches::kNoStartupWindow); 218 cmd.AppendSwitch(switches::kNoStartupWindow);
220 219
221 base::win::ScopedHandle chrome_handle; 220 base::win::ScopedHandle chrome_handle;
222 base::Time started = base::Time::Now(); 221 base::Time started = base::Time::Now();
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 return std::string(); 276 return std::string();
278 } 277 }
279 278
280 CommandLine cmd(chrome_path); 279 CommandLine cmd(chrome_path);
281 CopyChromeSwitchesFromCurrentProcess(&cmd); 280 CopyChromeSwitchesFromCurrentProcess(&cmd);
282 cmd.AppendSwitchPath(switches::kUserDataDir, temp_user_data.path()); 281 cmd.AppendSwitchPath(switches::kUserDataDir, temp_user_data.path());
283 cmd.AppendSwitchPath(switches::kCloudPrintSetupProxy, printers_file); 282 cmd.AppendSwitchPath(switches::kCloudPrintSetupProxy, printers_file);
284 cmd.AppendSwitch(switches::kNoServiceAutorun); 283 cmd.AppendSwitch(switches::kNoServiceAutorun);
285 284
286 // Optional. 285 // Optional.
287 cmd.AppendSwitch(switches::kDisableBackgroundMode);
288 cmd.AppendSwitch(switches::kDisableDefaultApps); 286 cmd.AppendSwitch(switches::kDisableDefaultApps);
289 cmd.AppendSwitch(switches::kDisableExtensions); 287 cmd.AppendSwitch(switches::kDisableExtensions);
290 cmd.AppendSwitch(switches::kDisableSync); 288 cmd.AppendSwitch(switches::kDisableSync);
291 cmd.AppendSwitch(switches::kNoDefaultBrowserCheck); 289 cmd.AppendSwitch(switches::kNoDefaultBrowserCheck);
292 cmd.AppendSwitch(switches::kNoFirstRun); 290 cmd.AppendSwitch(switches::kNoFirstRun);
293 291
294 cmd.AppendArg( 292 cmd.AppendArg(
295 cloud_devices::GetCloudPrintEnableWithSigninURL(proxy_id).spec()); 293 cloud_devices::GetCloudPrintEnableWithSigninURL(proxy_id).spec());
296 294
297 base::win::ScopedHandle chrome_handle; 295 base::win::ScopedHandle chrome_handle;
(...skipping 15 matching lines...) Expand all
313 LOG(ERROR) << "Chrome launch failed."; 311 LOG(ERROR) << "Chrome launch failed.";
314 return std::string(); 312 return std::string();
315 } 313 }
316 if (!json.empty()) { 314 if (!json.empty()) {
317 // Close chrome because Service State is ready. 315 // Close chrome because Service State is ready.
318 CloseChrome(chrome_handle, thread_id); 316 CloseChrome(chrome_handle, thread_id);
319 return json; 317 return json;
320 } 318 }
321 } 319 }
322 } 320 }
323
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698