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