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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 ::switches::kUIPrioritizeInGpuProcess, | 122 ::switches::kUIPrioritizeInGpuProcess, |
123 #if defined(USE_CRAS) | 123 #if defined(USE_CRAS) |
124 ::switches::kUseCras, | 124 ::switches::kUseCras, |
125 #endif | 125 #endif |
126 ::switches::kUseGL, | 126 ::switches::kUseGL, |
127 ::switches::kUserDataDir, | 127 ::switches::kUserDataDir, |
128 ::switches::kUseExynosVda, | 128 ::switches::kUseExynosVda, |
129 ::switches::kV, | 129 ::switches::kV, |
130 ash::switches::kAshTouchHud, | 130 ash::switches::kAshTouchHud, |
131 ash::switches::kAuraLegacyPowerButton, | 131 ash::switches::kAuraLegacyPowerButton, |
| 132 ash::switches::kAshDisableNewAudioHandler, |
132 ash::switches::kAshDisableNewNetworkStatusArea, | 133 ash::switches::kAshDisableNewNetworkStatusArea, |
133 ash::switches::kAshEnableNewAudioHandler, | |
134 // Please keep these in alphabetical order. Non-UI Compositor switches | 134 // Please keep these in alphabetical order. Non-UI Compositor switches |
135 // here should also be added to | 135 // here should also be added to |
136 // content/browser/renderer_host/render_process_host_impl.cc. | 136 // content/browser/renderer_host/render_process_host_impl.cc. |
137 cc::switches::kBackgroundColorInsteadOfCheckerboard, | 137 cc::switches::kBackgroundColorInsteadOfCheckerboard, |
138 cc::switches::kCompositeToMailbox, | 138 cc::switches::kCompositeToMailbox, |
139 cc::switches::kDisableColorEstimator, | 139 cc::switches::kDisableColorEstimator, |
140 cc::switches::kDisableImplSidePainting, | 140 cc::switches::kDisableImplSidePainting, |
141 cc::switches::kDisablePinchZoomScrollbars, | 141 cc::switches::kDisablePinchZoomScrollbars, |
142 cc::switches::kDisableThreadedAnimation, | 142 cc::switches::kDisableThreadedAnimation, |
143 cc::switches::kEnableCompositorFrameMessage, | 143 cc::switches::kEnableCompositorFrameMessage, |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 // Relaunch chrome without session manager on dev box. | 335 // Relaunch chrome without session manager on dev box. |
336 ReLaunch(command_line); | 336 ReLaunch(command_line); |
337 return; | 337 return; |
338 } | 338 } |
339 | 339 |
340 // ChromeRestartRequest deletes itself after request sent to session manager. | 340 // ChromeRestartRequest deletes itself after request sent to session manager. |
341 (new ChromeRestartRequest(command_line))->Start(); | 341 (new ChromeRestartRequest(command_line))->Start(); |
342 } | 342 } |
343 | 343 |
344 } // namespace chromeos | 344 } // namespace chromeos |
OLD | NEW |