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

Side by Side Diff: chrome/browser/chromeos/login/chrome_restart_request.cc

Issue 240903002: Add consumer_device_management_service() in BrowserPolicyConnectorChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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
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/chromeos/login/chrome_restart_request.h" 5 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 cc::switches::kShowSurfaceDamageRects, 198 cc::switches::kShowSurfaceDamageRects,
199 cc::switches::kSlowDownRasterScaleFactor, 199 cc::switches::kSlowDownRasterScaleFactor,
200 cc::switches::kUIDisablePartialSwap, 200 cc::switches::kUIDisablePartialSwap,
201 chromeos::switches::kDbusStub, 201 chromeos::switches::kDbusStub,
202 chromeos::switches::kDisableLoginAnimations, 202 chromeos::switches::kDisableLoginAnimations,
203 chromeos::switches::kHasChromeOSDiamondKey, 203 chromeos::switches::kHasChromeOSDiamondKey,
204 chromeos::switches::kHasChromeOSKeyboard, 204 chromeos::switches::kHasChromeOSKeyboard,
205 chromeos::switches::kLoginProfile, 205 chromeos::switches::kLoginProfile,
206 chromeos::switches::kNaturalScrollDefault, 206 chromeos::switches::kNaturalScrollDefault,
207 chromeos::switches::kSystemInDevMode, 207 chromeos::switches::kSystemInDevMode,
208 policy::switches::kConsumerDeviceManagementUrl,
209 policy::switches::kDeviceManagementUrl,
208 ::switches::kEnableBrowserTextSubpixelPositioning, 210 ::switches::kEnableBrowserTextSubpixelPositioning,
209 ::switches::kEnableWebkitTextSubpixelPositioning, 211 ::switches::kEnableWebkitTextSubpixelPositioning,
210 policy::switches::kDeviceManagementUrl,
211 wm::switches::kWindowAnimationsDisabled, 212 wm::switches::kWindowAnimationsDisabled,
212 }; 213 };
213 command_line->CopySwitchesFrom(base_command_line, 214 command_line->CopySwitchesFrom(base_command_line,
214 kForwardSwitches, 215 kForwardSwitches,
215 arraysize(kForwardSwitches)); 216 arraysize(kForwardSwitches));
216 217
217 if (start_url.is_valid()) 218 if (start_url.is_valid())
218 command_line->AppendArg(start_url.spec()); 219 command_line->AppendArg(start_url.spec());
219 220
220 for (base::DictionaryValue::Iterator it(new_switches); 221 for (base::DictionaryValue::Iterator it(new_switches);
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 // Relaunch chrome without session manager on dev box. 371 // Relaunch chrome without session manager on dev box.
371 ReLaunch(command_line); 372 ReLaunch(command_line);
372 return; 373 return;
373 } 374 }
374 375
375 // ChromeRestartRequest deletes itself after request sent to session manager. 376 // ChromeRestartRequest deletes itself after request sent to session manager.
376 (new ChromeRestartRequest(command_line))->Start(); 377 (new ChromeRestartRequest(command_line))->Start();
377 } 378 }
378 379
379 } // namespace chromeos 380 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698