| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 ::switches::kUIDisableThreadedCompositing, | 128 ::switches::kUIDisableThreadedCompositing, |
| 129 ::switches::kUIMaxFramesPending, | 129 ::switches::kUIMaxFramesPending, |
| 130 ::switches::kUIPrioritizeInGpuProcess, | 130 ::switches::kUIPrioritizeInGpuProcess, |
| 131 #if defined(USE_CRAS) | 131 #if defined(USE_CRAS) |
| 132 ::switches::kUseCras, | 132 ::switches::kUseCras, |
| 133 #endif | 133 #endif |
| 134 ::switches::kUseGL, | 134 ::switches::kUseGL, |
| 135 ::switches::kUserDataDir, | 135 ::switches::kUserDataDir, |
| 136 ::switches::kV, | 136 ::switches::kV, |
| 137 ::switches::kEnableWebGLDraftExtensions, | 137 ::switches::kEnableWebGLDraftExtensions, |
| 138 #if defined(ENABLE_WEBRTC) |
| 139 ::switches::kEnableWebRtcAecRecordings, |
| 140 ::switches::kEnableWebRtcTcpServerSocket, |
| 141 ::switches::kEnableWebRtcHWDecoding, |
| 142 ::switches::kEnableWebRtcHWEncoding, |
| 143 #endif |
| 138 ash::switches::kAshDefaultGuestWallpaperLarge, | 144 ash::switches::kAshDefaultGuestWallpaperLarge, |
| 139 ash::switches::kAshDefaultGuestWallpaperSmall, | 145 ash::switches::kAshDefaultGuestWallpaperSmall, |
| 140 ash::switches::kAshDefaultWallpaperLarge, | 146 ash::switches::kAshDefaultWallpaperLarge, |
| 141 ash::switches::kAshDefaultWallpaperSmall, | 147 ash::switches::kAshDefaultWallpaperSmall, |
| 142 #if defined(OS_CHROMEOS) | 148 #if defined(OS_CHROMEOS) |
| 143 ash::switches::kAshDisableAudioDeviceMenu, | 149 ash::switches::kAshDisableAudioDeviceMenu, |
| 144 #endif | 150 #endif |
| 145 ash::switches::kAshHostWindowBounds, | 151 ash::switches::kAshHostWindowBounds, |
| 146 ash::switches::kAshTouchHud, | 152 ash::switches::kAshTouchHud, |
| 147 ash::switches::kAuraLegacyPowerButton, | 153 ash::switches::kAuraLegacyPowerButton, |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 // Relaunch chrome without session manager on dev box. | 358 // Relaunch chrome without session manager on dev box. |
| 353 ReLaunch(command_line); | 359 ReLaunch(command_line); |
| 354 return; | 360 return; |
| 355 } | 361 } |
| 356 | 362 |
| 357 // ChromeRestartRequest deletes itself after request sent to session manager. | 363 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 358 (new ChromeRestartRequest(command_line))->Start(); | 364 (new ChromeRestartRequest(command_line))->Start(); |
| 359 } | 365 } |
| 360 | 366 |
| 361 } // namespace chromeos | 367 } // namespace chromeos |
| OLD | NEW |