| 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/chromeos/chromeos_version.h" | 10 #include "base/chromeos/chromeos_version.h" |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 ::switches::kUseCras, | 116 ::switches::kUseCras, |
| 117 #endif | 117 #endif |
| 118 ::switches::kUseGL, | 118 ::switches::kUseGL, |
| 119 ::switches::kUserDataDir, | 119 ::switches::kUserDataDir, |
| 120 ::switches::kUseExynosVda, | 120 ::switches::kUseExynosVda, |
| 121 ash::switches::kAshTouchHud, | 121 ash::switches::kAshTouchHud, |
| 122 ash::switches::kAuraLegacyPowerButton, | 122 ash::switches::kAuraLegacyPowerButton, |
| 123 ash::switches::kAshEnableNewNetworkStatusArea, | 123 ash::switches::kAshEnableNewNetworkStatusArea, |
| 124 cc::switches::kDisableThreadedAnimation, | 124 cc::switches::kDisableThreadedAnimation, |
| 125 cc::switches::kEnablePartialSwap, | 125 cc::switches::kEnablePartialSwap, |
| 126 cc::switches::kEnablePinchZoomScrollbars, |
| 127 cc::switches::kDisablePinchZoomScrollbars, |
| 126 chromeos::switches::kDbusStub, | 128 chromeos::switches::kDbusStub, |
| 127 gfx::switches::kEnableBrowserTextSubpixelPositioning, | 129 gfx::switches::kEnableBrowserTextSubpixelPositioning, |
| 128 gfx::switches::kEnableWebkitTextSubpixelPositioning, | 130 gfx::switches::kEnableWebkitTextSubpixelPositioning, |
| 129 views::corewm::switches::kNoDropShadows, | 131 views::corewm::switches::kNoDropShadows, |
| 130 views::corewm::switches::kWindowAnimationsDisabled, | 132 views::corewm::switches::kWindowAnimationsDisabled, |
| 131 }; | 133 }; |
| 132 command_line->CopySwitchesFrom(base_command_line, | 134 command_line->CopySwitchesFrom(base_command_line, |
| 133 kForwardSwitches, | 135 kForwardSwitches, |
| 134 arraysize(kForwardSwitches)); | 136 arraysize(kForwardSwitches)); |
| 135 | 137 |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 // Relaunch chrome without session manager on dev box. | 307 // Relaunch chrome without session manager on dev box. |
| 306 ReLaunch(command_line); | 308 ReLaunch(command_line); |
| 307 return; | 309 return; |
| 308 } | 310 } |
| 309 | 311 |
| 310 // ChromeRestartRequest deletes itself after request sent to session manager. | 312 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 311 (new ChromeRestartRequest(command_line))->Start(); | 313 (new ChromeRestartRequest(command_line))->Start(); |
| 312 } | 314 } |
| 313 | 315 |
| 314 } // namespace chromeos | 316 } // namespace chromeos |
| OLD | NEW |