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

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

Issue 1439803002: Remove logic for unused foreground auto-launch mode on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@d1_rm_auto_launch_trial
Patch Set: Created 5 years, 1 month 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
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/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 if (!chrome_path.empty()) { 207 if (!chrome_path.empty()) {
208 base::CommandLine cmd(chrome_path); 208 base::CommandLine cmd(chrome_path);
209 CopyChromeSwitchesFromCurrentProcess(&cmd); 209 CopyChromeSwitchesFromCurrentProcess(&cmd);
210 210
211 // Required switches. 211 // Required switches.
212 cmd.AppendSwitchASCII(switches::kProcessType, switches::kServiceProcess); 212 cmd.AppendSwitchASCII(switches::kProcessType, switches::kServiceProcess);
213 cmd.AppendSwitchPath(switches::kUserDataDir, user_data_); 213 cmd.AppendSwitchPath(switches::kUserDataDir, user_data_);
214 cmd.AppendSwitch(switches::kNoServiceAutorun); 214 cmd.AppendSwitch(switches::kNoServiceAutorun);
215 215
216 // Optional. 216 // Optional.
217 cmd.AppendSwitch(switches::kAutoLaunchAtStartup);
218 cmd.AppendSwitch(switches::kDisableDefaultApps); 217 cmd.AppendSwitch(switches::kDisableDefaultApps);
219 cmd.AppendSwitch(switches::kDisableExtensions); 218 cmd.AppendSwitch(switches::kDisableExtensions);
220 cmd.AppendSwitch(switches::kDisableGpu); 219 cmd.AppendSwitch(switches::kDisableGpu);
221 cmd.AppendSwitch(switches::kDisableSoftwareRasterizer); 220 cmd.AppendSwitch(switches::kDisableSoftwareRasterizer);
222 cmd.AppendSwitch(switches::kDisableSync); 221 cmd.AppendSwitch(switches::kDisableSync);
223 cmd.AppendSwitch(switches::kNoFirstRun); 222 cmd.AppendSwitch(switches::kNoFirstRun);
224 cmd.AppendSwitch(switches::kNoStartupWindow); 223 cmd.AppendSwitch(switches::kNoStartupWindow);
225 224
226 base::win::ScopedHandle chrome_handle; 225 base::win::ScopedHandle chrome_handle;
227 base::Time started = base::Time::Now(); 226 base::Time started = base::Time::Now();
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 LOG(ERROR) << "Chrome launch failed."; 321 LOG(ERROR) << "Chrome launch failed.";
323 return std::string(); 322 return std::string();
324 } 323 }
325 if (!json.empty()) { 324 if (!json.empty()) {
326 // Close chrome because Service State is ready. 325 // Close chrome because Service State is ready.
327 CloseChrome(chrome_process.Pass(), thread_id); 326 CloseChrome(chrome_process.Pass(), thread_id);
328 return json; 327 return json;
329 } 328 }
330 } 329 }
331 } 330 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698