| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 #if defined(USE_CRAS) | 117 #if defined(USE_CRAS) |
| 118 ::switches::kUseCras, | 118 ::switches::kUseCras, |
| 119 #endif | 119 #endif |
| 120 ::switches::kUseGL, | 120 ::switches::kUseGL, |
| 121 ::switches::kUserDataDir, | 121 ::switches::kUserDataDir, |
| 122 ::switches::kUseExynosVda, | 122 ::switches::kUseExynosVda, |
| 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, | |
| 128 ash::switches::kAshEnableAudioDeviceMenu, | 127 ash::switches::kAshEnableAudioDeviceMenu, |
| 129 // Please keep these in alphabetical order. Non-UI Compositor switches | 128 // Please keep these in alphabetical order. Non-UI Compositor switches |
| 130 // here should also be added to | 129 // here should also be added to |
| 131 // content/browser/renderer_host/render_process_host_impl.cc. | 130 // content/browser/renderer_host/render_process_host_impl.cc. |
| 132 cc::switches::kBackgroundColorInsteadOfCheckerboard, | 131 cc::switches::kBackgroundColorInsteadOfCheckerboard, |
| 133 cc::switches::kCompositeToMailbox, | 132 cc::switches::kCompositeToMailbox, |
| 134 cc::switches::kDisableColorEstimator, | 133 cc::switches::kDisableColorEstimator, |
| 135 cc::switches::kDisableImplSidePainting, | 134 cc::switches::kDisableImplSidePainting, |
| 136 cc::switches::kDisablePinchZoomScrollbars, | 135 cc::switches::kDisablePinchZoomScrollbars, |
| 137 cc::switches::kDisableThreadedAnimation, | 136 cc::switches::kDisableThreadedAnimation, |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 // Relaunch chrome without session manager on dev box. | 334 // Relaunch chrome without session manager on dev box. |
| 336 ReLaunch(command_line); | 335 ReLaunch(command_line); |
| 337 return; | 336 return; |
| 338 } | 337 } |
| 339 | 338 |
| 340 // ChromeRestartRequest deletes itself after request sent to session manager. | 339 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 341 (new ChromeRestartRequest(command_line))->Start(); | 340 (new ChromeRestartRequest(command_line))->Start(); |
| 342 } | 341 } |
| 343 | 342 |
| 344 } // namespace chromeos | 343 } // namespace chromeos |
| OLD | NEW |