| 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/base_switches.h" | 10 #include "base/base_switches.h" |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 #if defined(ENABLE_WEBRTC) | 167 #if defined(ENABLE_WEBRTC) |
| 168 ::switches::kDisableWebRtcHWDecoding, | 168 ::switches::kDisableWebRtcHWDecoding, |
| 169 ::switches::kDisableWebRtcHWEncoding, | 169 ::switches::kDisableWebRtcHWEncoding, |
| 170 ::switches::kEnableWebRtcHWH264Encoding, | 170 ::switches::kEnableWebRtcHWH264Encoding, |
| 171 #endif | 171 #endif |
| 172 ::switches::kDisableVaapiAcceleratedVideoEncode, | 172 ::switches::kDisableVaapiAcceleratedVideoEncode, |
| 173 #if defined(USE_OZONE) | 173 #if defined(USE_OZONE) |
| 174 ::switches::kOzoneInitialDisplayBounds, | 174 ::switches::kOzoneInitialDisplayBounds, |
| 175 ::switches::kOzoneInitialDisplayPhysicalSizeMm, | 175 ::switches::kOzoneInitialDisplayPhysicalSizeMm, |
| 176 ::switches::kOzonePlatform, | 176 ::switches::kOzonePlatform, |
| 177 ::switches::kOzoneUseDmaBufMmap, |
| 177 #endif | 178 #endif |
| 178 app_list::switches::kDisableSyncAppList, | 179 app_list::switches::kDisableSyncAppList, |
| 179 app_list::switches::kEnableCenteredAppList, | 180 app_list::switches::kEnableCenteredAppList, |
| 180 app_list::switches::kEnableSyncAppList, | 181 app_list::switches::kEnableSyncAppList, |
| 181 ash::switches::kAshEnableTouchView, | 182 ash::switches::kAshEnableTouchView, |
| 182 ash::switches::kAshEnableUnifiedDesktop, | 183 ash::switches::kAshEnableUnifiedDesktop, |
| 183 ash::switches::kAshHostWindowBounds, | 184 ash::switches::kAshHostWindowBounds, |
| 184 ash::switches::kAshTouchHud, | 185 ash::switches::kAshTouchHud, |
| 185 ash::switches::kAuraLegacyPowerButton, | 186 ash::switches::kAuraLegacyPowerButton, |
| 186 chromeos::switches::kDefaultWallpaperLarge, | 187 chromeos::switches::kDefaultWallpaperLarge, |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 // Relaunch chrome without session manager on dev box. | 357 // Relaunch chrome without session manager on dev box. |
| 357 ReLaunch(command_line); | 358 ReLaunch(command_line); |
| 358 return; | 359 return; |
| 359 } | 360 } |
| 360 | 361 |
| 361 // ChromeRestartRequest deletes itself after request sent to session manager. | 362 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 362 (new ChromeRestartRequest(command_line.argv()))->Start(); | 363 (new ChromeRestartRequest(command_line.argv()))->Start(); |
| 363 } | 364 } |
| 364 | 365 |
| 365 } // namespace chromeos | 366 } // namespace chromeos |
| OLD | NEW |