| 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 ::switches::kOzoneInitialDisplayPhysicalSizeMm, | 174 ::switches::kOzoneInitialDisplayPhysicalSizeMm, |
| 175 ::switches::kOzonePlatform, | 175 ::switches::kOzonePlatform, |
| 176 #endif | 176 #endif |
| 177 app_list::switches::kDisableSyncAppList, | 177 app_list::switches::kDisableSyncAppList, |
| 178 app_list::switches::kEnableCenteredAppList, | 178 app_list::switches::kEnableCenteredAppList, |
| 179 app_list::switches::kEnableSyncAppList, | 179 app_list::switches::kEnableSyncAppList, |
| 180 ash::switches::kAshEnableTouchView, | 180 ash::switches::kAshEnableTouchView, |
| 181 ash::switches::kAshEnableUnifiedDesktop, | 181 ash::switches::kAshEnableUnifiedDesktop, |
| 182 ash::switches::kAshHostWindowBounds, | 182 ash::switches::kAshHostWindowBounds, |
| 183 ash::switches::kAshTouchHud, | 183 ash::switches::kAshTouchHud, |
| 184 ash::switches::kAshUseNewVKWindowBehavior, |
| 184 ash::switches::kAuraLegacyPowerButton, | 185 ash::switches::kAuraLegacyPowerButton, |
| 185 chromeos::switches::kDefaultWallpaperLarge, | 186 chromeos::switches::kDefaultWallpaperLarge, |
| 186 chromeos::switches::kDefaultWallpaperSmall, | 187 chromeos::switches::kDefaultWallpaperSmall, |
| 187 chromeos::switches::kGuestWallpaperLarge, | 188 chromeos::switches::kGuestWallpaperLarge, |
| 188 chromeos::switches::kGuestWallpaperSmall, | 189 chromeos::switches::kGuestWallpaperSmall, |
| 189 // Please keep these in alphabetical order. Non-UI Compositor switches | 190 // Please keep these in alphabetical order. Non-UI Compositor switches |
| 190 // here should also be added to | 191 // here should also be added to |
| 191 // content/browser/renderer_host/render_process_host_impl.cc. | 192 // content/browser/renderer_host/render_process_host_impl.cc. |
| 192 cc::switches::kDisableCachedPictureRaster, | 193 cc::switches::kDisableCachedPictureRaster, |
| 193 cc::switches::kDisableCompositedAntialiasing, | 194 cc::switches::kDisableCompositedAntialiasing, |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 // Relaunch chrome without session manager on dev box. | 362 // Relaunch chrome without session manager on dev box. |
| 362 ReLaunch(command_line); | 363 ReLaunch(command_line); |
| 363 return; | 364 return; |
| 364 } | 365 } |
| 365 | 366 |
| 366 // ChromeRestartRequest deletes itself after request sent to session manager. | 367 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 367 (new ChromeRestartRequest(command_line.argv()))->Start(); | 368 (new ChromeRestartRequest(command_line.argv()))->Start(); |
| 368 } | 369 } |
| 369 | 370 |
| 370 } // namespace chromeos | 371 } // namespace chromeos |
| OLD | NEW |