| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 ::switches::kRendererStartupDialog, | 104 ::switches::kRendererStartupDialog, |
| 105 #if defined(USE_XI2_MT) | 105 #if defined(USE_XI2_MT) |
| 106 ::switches::kTouchCalibration, | 106 ::switches::kTouchCalibration, |
| 107 #endif | 107 #endif |
| 108 ::switches::kTouchDevices, | 108 ::switches::kTouchDevices, |
| 109 ::switches::kTouchEvents, | 109 ::switches::kTouchEvents, |
| 110 ::switches::kTouchOptimizedUI, | 110 ::switches::kTouchOptimizedUI, |
| 111 ::switches::kOldCheckboxStyle, | 111 ::switches::kOldCheckboxStyle, |
| 112 ::switches::kUIEnablePartialSwap, | 112 ::switches::kUIEnablePartialSwap, |
| 113 ::switches::kUIEnableThreadedCompositing, | 113 ::switches::kUIEnableThreadedCompositing, |
| 114 ::switches::kUIMaxFramesPending, |
| 114 ::switches::kUIPrioritizeInGpuProcess, | 115 ::switches::kUIPrioritizeInGpuProcess, |
| 115 #if defined(USE_CRAS) | 116 #if defined(USE_CRAS) |
| 116 ::switches::kUseCras, | 117 ::switches::kUseCras, |
| 117 #endif | 118 #endif |
| 118 ::switches::kUseGL, | 119 ::switches::kUseGL, |
| 119 ::switches::kUserDataDir, | 120 ::switches::kUserDataDir, |
| 120 ::switches::kUseExynosVda, | 121 ::switches::kUseExynosVda, |
| 121 ash::switches::kAshTouchHud, | 122 ash::switches::kAshTouchHud, |
| 122 ash::switches::kAuraLegacyPowerButton, | 123 ash::switches::kAuraLegacyPowerButton, |
| 123 ash::switches::kAshEnableNewNetworkStatusArea, | 124 ash::switches::kAshEnableNewNetworkStatusArea, |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 // Relaunch chrome without session manager on dev box. | 298 // Relaunch chrome without session manager on dev box. |
| 298 ReLaunch(command_line); | 299 ReLaunch(command_line); |
| 299 return; | 300 return; |
| 300 } | 301 } |
| 301 | 302 |
| 302 // ChromeRestartRequest deletes itself after request sent to session manager. | 303 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 303 (new ChromeRestartRequest(command_line))->Start(); | 304 (new ChromeRestartRequest(command_line))->Start(); |
| 304 } | 305 } |
| 305 | 306 |
| 306 } // namespace chromeos | 307 } // namespace chromeos |
| OLD | NEW |