OLD | NEW |
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 <sys/socket.h> | 7 #include <sys/socket.h> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 chromeos::switches::kDisableArcDataWipe, | 214 chromeos::switches::kDisableArcDataWipe, |
215 chromeos::switches::kDisableArcOptInVerification, | 215 chromeos::switches::kDisableArcOptInVerification, |
216 chromeos::switches::kDisableLoginAnimations, | 216 chromeos::switches::kDisableLoginAnimations, |
217 chromeos::switches::kEnableArc, | 217 chromeos::switches::kEnableArc, |
218 chromeos::switches::kEnterpriseDisableArc, | 218 chromeos::switches::kEnterpriseDisableArc, |
219 chromeos::switches::kEnterpriseEnableForcedReEnrollment, | 219 chromeos::switches::kEnterpriseEnableForcedReEnrollment, |
220 chromeos::switches::kHasChromeOSDiamondKey, | 220 chromeos::switches::kHasChromeOSDiamondKey, |
221 chromeos::switches::kLoginProfile, | 221 chromeos::switches::kLoginProfile, |
222 chromeos::switches::kNaturalScrollDefault, | 222 chromeos::switches::kNaturalScrollDefault, |
223 chromeos::switches::kShowMdLogin, | 223 chromeos::switches::kShowMdLogin, |
| 224 chromeos::switches::kShowNonViewMdLogin, |
224 chromeos::switches::kSystemInDevMode, | 225 chromeos::switches::kSystemInDevMode, |
225 policy::switches::kDeviceManagementUrl, | 226 policy::switches::kDeviceManagementUrl, |
226 wm::switches::kWindowAnimationsDisabled, | 227 wm::switches::kWindowAnimationsDisabled, |
227 }; | 228 }; |
228 command_line->CopySwitchesFrom(base_command_line, | 229 command_line->CopySwitchesFrom(base_command_line, |
229 kForwardSwitches, | 230 kForwardSwitches, |
230 arraysize(kForwardSwitches)); | 231 arraysize(kForwardSwitches)); |
231 | 232 |
232 if (start_url.is_valid()) | 233 if (start_url.is_valid()) |
233 command_line->AppendArg(start_url.spec()); | 234 command_line->AppendArg(start_url.spec()); |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
392 // Relaunch chrome without session manager on dev box. | 393 // Relaunch chrome without session manager on dev box. |
393 ReLaunch(command_line); | 394 ReLaunch(command_line); |
394 return; | 395 return; |
395 } | 396 } |
396 | 397 |
397 // ChromeRestartRequest deletes itself after request sent to session manager. | 398 // ChromeRestartRequest deletes itself after request sent to session manager. |
398 (new ChromeRestartRequest(command_line.argv()))->Start(); | 399 (new ChromeRestartRequest(command_line.argv()))->Start(); |
399 } | 400 } |
400 | 401 |
401 } // namespace chromeos | 402 } // namespace chromeos |
OLD | NEW |