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/common/ash_switches.h" | 9 #include "ash/common/ash_switches.h" |
10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 #endif | 177 #endif |
178 app_list::switches::kDisableSyncAppList, | 178 app_list::switches::kDisableSyncAppList, |
179 app_list::switches::kEnableCenteredAppList, | 179 app_list::switches::kEnableCenteredAppList, |
180 app_list::switches::kEnableSyncAppList, | 180 app_list::switches::kEnableSyncAppList, |
181 ash::switches::kAshEnableTouchView, | 181 ash::switches::kAshEnableTouchView, |
| 182 ash::switches::kAshEnablePalette, |
| 183 ash::switches::kAshEnableExperimentalPaletteFeatures, |
182 ash::switches::kAshEnableUnifiedDesktop, | 184 ash::switches::kAshEnableUnifiedDesktop, |
183 ash::switches::kAshHostWindowBounds, | 185 ash::switches::kAshHostWindowBounds, |
184 ash::switches::kAshTouchHud, | 186 ash::switches::kAshTouchHud, |
185 ash::switches::kAuraLegacyPowerButton, | 187 ash::switches::kAuraLegacyPowerButton, |
186 chromeos::switches::kDefaultWallpaperLarge, | 188 chromeos::switches::kDefaultWallpaperLarge, |
187 chromeos::switches::kDefaultWallpaperSmall, | 189 chromeos::switches::kDefaultWallpaperSmall, |
188 chromeos::switches::kGuestWallpaperLarge, | 190 chromeos::switches::kGuestWallpaperLarge, |
189 chromeos::switches::kGuestWallpaperSmall, | 191 chromeos::switches::kGuestWallpaperSmall, |
190 // Please keep these in alphabetical order. Non-UI Compositor switches | 192 // Please keep these in alphabetical order. Non-UI Compositor switches |
191 // here should also be added to | 193 // here should also be added to |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 // Relaunch chrome without session manager on dev box. | 364 // Relaunch chrome without session manager on dev box. |
363 ReLaunch(command_line); | 365 ReLaunch(command_line); |
364 return; | 366 return; |
365 } | 367 } |
366 | 368 |
367 // ChromeRestartRequest deletes itself after request sent to session manager. | 369 // ChromeRestartRequest deletes itself after request sent to session manager. |
368 (new ChromeRestartRequest(command_line.argv()))->Start(); | 370 (new ChromeRestartRequest(command_line.argv()))->Start(); |
369 } | 371 } |
370 | 372 |
371 } // namespace chromeos | 373 } // namespace chromeos |
OLD | NEW |