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 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 chromeos::switches::kDbusUnstubClients, | 206 chromeos::switches::kDbusUnstubClients, |
207 chromeos::switches::kDisableLoginAnimations, | 207 chromeos::switches::kDisableLoginAnimations, |
208 chromeos::switches::kEnableConsumerManagement, | 208 chromeos::switches::kEnableConsumerManagement, |
209 chromeos::switches::kEnterpriseEnableForcedReEnrollment, | 209 chromeos::switches::kEnterpriseEnableForcedReEnrollment, |
210 chromeos::switches::kHasChromeOSDiamondKey, | 210 chromeos::switches::kHasChromeOSDiamondKey, |
211 chromeos::switches::kHasChromeOSKeyboard, | 211 chromeos::switches::kHasChromeOSKeyboard, |
212 chromeos::switches::kLoginProfile, | 212 chromeos::switches::kLoginProfile, |
213 chromeos::switches::kNaturalScrollDefault, | 213 chromeos::switches::kNaturalScrollDefault, |
214 chromeos::switches::kSystemInDevMode, | 214 chromeos::switches::kSystemInDevMode, |
215 policy::switches::kDeviceManagementUrl, | 215 policy::switches::kDeviceManagementUrl, |
216 ::switches::kEnableWebkitTextSubpixelPositioning, | |
217 wm::switches::kWindowAnimationsDisabled, | 216 wm::switches::kWindowAnimationsDisabled, |
218 }; | 217 }; |
219 command_line->CopySwitchesFrom(base_command_line, | 218 command_line->CopySwitchesFrom(base_command_line, |
220 kForwardSwitches, | 219 kForwardSwitches, |
221 arraysize(kForwardSwitches)); | 220 arraysize(kForwardSwitches)); |
222 | 221 |
223 if (start_url.is_valid()) | 222 if (start_url.is_valid()) |
224 command_line->AppendArg(start_url.spec()); | 223 command_line->AppendArg(start_url.spec()); |
225 | 224 |
226 for (base::DictionaryValue::Iterator it(new_switches); | 225 for (base::DictionaryValue::Iterator it(new_switches); |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 // Relaunch chrome without session manager on dev box. | 376 // Relaunch chrome without session manager on dev box. |
378 ReLaunch(command_line); | 377 ReLaunch(command_line); |
379 return; | 378 return; |
380 } | 379 } |
381 | 380 |
382 // ChromeRestartRequest deletes itself after request sent to session manager. | 381 // ChromeRestartRequest deletes itself after request sent to session manager. |
383 (new ChromeRestartRequest(command_line))->Start(); | 382 (new ChromeRestartRequest(command_line))->Start(); |
384 } | 383 } |
385 | 384 |
386 } // namespace chromeos | 385 } // namespace chromeos |
OLD | NEW |