| 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 <sys/socket.h> | 7 #include <sys/socket.h> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/common/ash_switches.h" | 10 #include "ash/common/ash_switches.h" |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 ::switches::kDisableWebRtcHWEncoding, | 172 ::switches::kDisableWebRtcHWEncoding, |
| 173 ::switches::kEnableWebRtcHWH264Encoding, | 173 ::switches::kEnableWebRtcHWH264Encoding, |
| 174 #endif | 174 #endif |
| 175 ::switches::kDisableVaapiAcceleratedVideoEncode, | 175 ::switches::kDisableVaapiAcceleratedVideoEncode, |
| 176 #if defined(USE_OZONE) | 176 #if defined(USE_OZONE) |
| 177 ::switches::kOzoneInitialDisplayBounds, | 177 ::switches::kOzoneInitialDisplayBounds, |
| 178 ::switches::kOzoneInitialDisplayPhysicalSizeMm, | 178 ::switches::kOzoneInitialDisplayPhysicalSizeMm, |
| 179 ::switches::kOzonePlatform, | 179 ::switches::kOzonePlatform, |
| 180 #endif | 180 #endif |
| 181 app_list::switches::kDisableSyncAppList, | 181 app_list::switches::kDisableSyncAppList, |
| 182 app_list::switches::kEnableCenteredAppList, | |
| 183 app_list::switches::kEnableSyncAppList, | 182 app_list::switches::kEnableSyncAppList, |
| 184 ash::switches::kAshEnableTouchView, | 183 ash::switches::kAshEnableTouchView, |
| 185 ash::switches::kAshEnablePalette, | 184 ash::switches::kAshEnablePalette, |
| 186 ash::switches::kAshEnablePaletteExperimentalFeatures, | 185 ash::switches::kAshEnablePaletteExperimentalFeatures, |
| 187 ash::switches::kAshEnablePaletteOnAllDisplays, | 186 ash::switches::kAshEnablePaletteOnAllDisplays, |
| 188 ash::switches::kAshTouchHud, | 187 ash::switches::kAshTouchHud, |
| 189 ash::switches::kAuraLegacyPowerButton, | 188 ash::switches::kAuraLegacyPowerButton, |
| 190 chromeos::switches::kDefaultWallpaperLarge, | 189 chromeos::switches::kDefaultWallpaperLarge, |
| 191 chromeos::switches::kDefaultWallpaperSmall, | 190 chromeos::switches::kDefaultWallpaperSmall, |
| 192 chromeos::switches::kGuestWallpaperLarge, | 191 chromeos::switches::kGuestWallpaperLarge, |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 // Relaunch chrome without session manager on dev box. | 394 // Relaunch chrome without session manager on dev box. |
| 396 ReLaunch(command_line); | 395 ReLaunch(command_line); |
| 397 return; | 396 return; |
| 398 } | 397 } |
| 399 | 398 |
| 400 // ChromeRestartRequest deletes itself after request sent to session manager. | 399 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 401 (new ChromeRestartRequest(command_line.argv()))->Start(); | 400 (new ChromeRestartRequest(command_line.argv()))->Start(); |
| 402 } | 401 } |
| 403 | 402 |
| 404 } // namespace chromeos | 403 } // namespace chromeos |
| OLD | NEW |