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

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
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h » ('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/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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 cc::switches::kShowFPSCounter, 191 cc::switches::kShowFPSCounter,
192 cc::switches::kShowLayerAnimationBounds, 192 cc::switches::kShowLayerAnimationBounds,
193 cc::switches::kShowNonOccludingRects, 193 cc::switches::kShowNonOccludingRects,
194 cc::switches::kShowOccludingRects, 194 cc::switches::kShowOccludingRects,
195 cc::switches::kShowPropertyChangedRects, 195 cc::switches::kShowPropertyChangedRects,
196 cc::switches::kShowReplicaScreenSpaceRects, 196 cc::switches::kShowReplicaScreenSpaceRects,
197 cc::switches::kShowScreenSpaceRects, 197 cc::switches::kShowScreenSpaceRects,
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::kConsumerDeviceManagementUrl,
201 chromeos::switches::kDbusStub, 202 chromeos::switches::kDbusStub,
202 chromeos::switches::kDisableLoginAnimations, 203 chromeos::switches::kDisableLoginAnimations,
203 chromeos::switches::kEnableConsumerManagement, 204 chromeos::switches::kEnableConsumerManagement,
204 chromeos::switches::kHasChromeOSDiamondKey, 205 chromeos::switches::kHasChromeOSDiamondKey,
205 chromeos::switches::kHasChromeOSKeyboard, 206 chromeos::switches::kHasChromeOSKeyboard,
206 chromeos::switches::kLoginProfile, 207 chromeos::switches::kLoginProfile,
207 chromeos::switches::kNaturalScrollDefault, 208 chromeos::switches::kNaturalScrollDefault,
208 chromeos::switches::kSystemInDevMode, 209 chromeos::switches::kSystemInDevMode,
210 policy::switches::kDeviceManagementUrl,
209 ::switches::kEnableBrowserTextSubpixelPositioning, 211 ::switches::kEnableBrowserTextSubpixelPositioning,
210 ::switches::kEnableWebkitTextSubpixelPositioning, 212 ::switches::kEnableWebkitTextSubpixelPositioning,
211 policy::switches::kDeviceManagementUrl,
212 wm::switches::kWindowAnimationsDisabled, 213 wm::switches::kWindowAnimationsDisabled,
213 }; 214 };
214 command_line->CopySwitchesFrom(base_command_line, 215 command_line->CopySwitchesFrom(base_command_line,
215 kForwardSwitches, 216 kForwardSwitches,
216 arraysize(kForwardSwitches)); 217 arraysize(kForwardSwitches));
217 218
218 if (start_url.is_valid()) 219 if (start_url.is_valid())
219 command_line->AppendArg(start_url.spec()); 220 command_line->AppendArg(start_url.spec());
220 221
221 for (base::DictionaryValue::Iterator it(new_switches); 222 for (base::DictionaryValue::Iterator it(new_switches);
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 // Relaunch chrome without session manager on dev box. 372 // Relaunch chrome without session manager on dev box.
372 ReLaunch(command_line); 373 ReLaunch(command_line);
373 return; 374 return;
374 } 375 }
375 376
376 // ChromeRestartRequest deletes itself after request sent to session manager. 377 // ChromeRestartRequest deletes itself after request sent to session manager.
377 (new ChromeRestartRequest(command_line))->Start(); 378 (new ChromeRestartRequest(command_line))->Start();
378 } 379 }
379 380
380 } // namespace chromeos 381 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698