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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 ::switches::kPpapiInProcess, | 105 ::switches::kPpapiInProcess, |
106 ::switches::kRendererStartupDialog, | 106 ::switches::kRendererStartupDialog, |
107 #if defined(USE_XI2_MT) | 107 #if defined(USE_XI2_MT) |
108 ::switches::kTouchCalibration, | 108 ::switches::kTouchCalibration, |
109 #endif | 109 #endif |
110 ::switches::kTouchDevices, | 110 ::switches::kTouchDevices, |
111 ::switches::kTouchEvents, | 111 ::switches::kTouchEvents, |
112 ::switches::kTouchOptimizedUI, | 112 ::switches::kTouchOptimizedUI, |
113 ::switches::kUIEnablePartialSwap, | 113 ::switches::kUIEnablePartialSwap, |
114 ::switches::kUIEnableThreadedCompositing, | 114 ::switches::kUIEnableThreadedCompositing, |
| 115 ::switches::kUIMaxFramesPending, |
115 ::switches::kUIPrioritizeInGpuProcess, | 116 ::switches::kUIPrioritizeInGpuProcess, |
116 #if defined(USE_CRAS) | 117 #if defined(USE_CRAS) |
117 ::switches::kUseCras, | 118 ::switches::kUseCras, |
118 #endif | 119 #endif |
119 ::switches::kUseGL, | 120 ::switches::kUseGL, |
120 ::switches::kUserDataDir, | 121 ::switches::kUserDataDir, |
121 ::switches::kUseExynosVda, | 122 ::switches::kUseExynosVda, |
122 ash::switches::kAshTouchHud, | 123 ash::switches::kAshTouchHud, |
123 ash::switches::kAuraLegacyPowerButton, | 124 ash::switches::kAuraLegacyPowerButton, |
124 ash::switches::kAshDisableNewNetworkStatusArea, | 125 ash::switches::kAshDisableNewNetworkStatusArea, |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
306 // Relaunch chrome without session manager on dev box. | 307 // Relaunch chrome without session manager on dev box. |
307 ReLaunch(command_line); | 308 ReLaunch(command_line); |
308 return; | 309 return; |
309 } | 310 } |
310 | 311 |
311 // ChromeRestartRequest deletes itself after request sent to session manager. | 312 // ChromeRestartRequest deletes itself after request sent to session manager. |
312 (new ChromeRestartRequest(command_line))->Start(); | 313 (new ChromeRestartRequest(command_line))->Start(); |
313 } | 314 } |
314 | 315 |
315 } // namespace chromeos | 316 } // namespace chromeos |
OLD | NEW |