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