| 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 <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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 chromeos::switches::kDbusUnstubClients, | 196 chromeos::switches::kDbusUnstubClients, |
| 197 chromeos::switches::kDisableLoginAnimations, | 197 chromeos::switches::kDisableLoginAnimations, |
| 198 chromeos::switches::kEnableConsumerManagement, | 198 chromeos::switches::kEnableConsumerManagement, |
| 199 chromeos::switches::kEnterpriseEnableForcedReEnrollment, | 199 chromeos::switches::kEnterpriseEnableForcedReEnrollment, |
| 200 chromeos::switches::kHasChromeOSDiamondKey, | 200 chromeos::switches::kHasChromeOSDiamondKey, |
| 201 chromeos::switches::kHasChromeOSKeyboard, | 201 chromeos::switches::kHasChromeOSKeyboard, |
| 202 chromeos::switches::kLoginProfile, | 202 chromeos::switches::kLoginProfile, |
| 203 chromeos::switches::kNaturalScrollDefault, | 203 chromeos::switches::kNaturalScrollDefault, |
| 204 chromeos::switches::kSystemInDevMode, | 204 chromeos::switches::kSystemInDevMode, |
| 205 policy::switches::kDeviceManagementUrl, | 205 policy::switches::kDeviceManagementUrl, |
| 206 ::switches::kEnableBrowserTextSubpixelPositioning, | |
| 207 ::switches::kEnableWebkitTextSubpixelPositioning, | 206 ::switches::kEnableWebkitTextSubpixelPositioning, |
| 208 wm::switches::kWindowAnimationsDisabled, | 207 wm::switches::kWindowAnimationsDisabled, |
| 209 }; | 208 }; |
| 210 command_line->CopySwitchesFrom(base_command_line, | 209 command_line->CopySwitchesFrom(base_command_line, |
| 211 kForwardSwitches, | 210 kForwardSwitches, |
| 212 arraysize(kForwardSwitches)); | 211 arraysize(kForwardSwitches)); |
| 213 | 212 |
| 214 if (start_url.is_valid()) | 213 if (start_url.is_valid()) |
| 215 command_line->AppendArg(start_url.spec()); | 214 command_line->AppendArg(start_url.spec()); |
| 216 | 215 |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 // Relaunch chrome without session manager on dev box. | 367 // Relaunch chrome without session manager on dev box. |
| 369 ReLaunch(command_line); | 368 ReLaunch(command_line); |
| 370 return; | 369 return; |
| 371 } | 370 } |
| 372 | 371 |
| 373 // ChromeRestartRequest deletes itself after request sent to session manager. | 372 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 374 (new ChromeRestartRequest(command_line))->Start(); | 373 (new ChromeRestartRequest(command_line))->Start(); |
| 375 } | 374 } |
| 376 | 375 |
| 377 } // namespace chromeos | 376 } // namespace chromeos |
| OLD | NEW |