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/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "chrome/common/chrome_switches.h" | 28 #include "chrome/common/chrome_switches.h" |
29 #include "chrome/common/url_constants.h" | 29 #include "chrome/common/url_constants.h" |
30 #include "chromeos/chromeos_switches.h" | 30 #include "chromeos/chromeos_switches.h" |
31 #include "chromeos/dbus/dbus_thread_manager.h" | 31 #include "chromeos/dbus/dbus_thread_manager.h" |
32 #include "chromeos/dbus/session_manager_client.h" | 32 #include "chromeos/dbus/session_manager_client.h" |
33 #include "components/policy/core/common/policy_switches.h" | 33 #include "components/policy/core/common/policy_switches.h" |
34 #include "content/public/browser/browser_thread.h" | 34 #include "content/public/browser/browser_thread.h" |
35 #include "content/public/common/content_switches.h" | 35 #include "content/public/common/content_switches.h" |
36 #include "gpu/command_buffer/service/gpu_switches.h" | 36 #include "gpu/command_buffer/service/gpu_switches.h" |
37 #include "media/base/media_switches.h" | 37 #include "media/base/media_switches.h" |
| 38 #include "ui/app_list/app_list_switches.h" |
38 #include "ui/base/ui_base_switches.h" | 39 #include "ui/base/ui_base_switches.h" |
39 #include "ui/compositor/compositor_switches.h" | 40 #include "ui/compositor/compositor_switches.h" |
40 #include "ui/events/event_switches.h" | 41 #include "ui/events/event_switches.h" |
41 #include "ui/gfx/switches.h" | 42 #include "ui/gfx/switches.h" |
42 #include "ui/gl/gl_switches.h" | 43 #include "ui/gl/gl_switches.h" |
43 #include "ui/ozone/ozone_switches.h" | 44 #include "ui/ozone/ozone_switches.h" |
44 #include "ui/wm/core/wm_core_switches.h" | 45 #include "ui/wm/core/wm_core_switches.h" |
45 #include "url/gurl.h" | 46 #include "url/gurl.h" |
46 | 47 |
47 using content::BrowserThread; | 48 using content::BrowserThread; |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 ::switches::kEnableWebGLDraftExtensions, | 157 ::switches::kEnableWebGLDraftExtensions, |
157 #if defined(ENABLE_WEBRTC) | 158 #if defined(ENABLE_WEBRTC) |
158 ::switches::kDisableWebRtcHWDecoding, | 159 ::switches::kDisableWebRtcHWDecoding, |
159 ::switches::kDisableWebRtcHWEncoding, | 160 ::switches::kDisableWebRtcHWEncoding, |
160 ::switches::kEnableAudioTrackProcessing, | 161 ::switches::kEnableAudioTrackProcessing, |
161 ::switches::kEnableWebRtcHWVp8Encoding, | 162 ::switches::kEnableWebRtcHWVp8Encoding, |
162 #endif | 163 #endif |
163 #if defined(USE_OZONE) | 164 #if defined(USE_OZONE) |
164 ::switches::kOzonePlatform, | 165 ::switches::kOzonePlatform, |
165 #endif | 166 #endif |
| 167 app_list::switches::kDisableSyncAppList, |
| 168 app_list::switches::kEnableSyncAppList, |
166 ash::switches::kAshDefaultWallpaperLarge, | 169 ash::switches::kAshDefaultWallpaperLarge, |
167 ash::switches::kAshDefaultWallpaperSmall, | 170 ash::switches::kAshDefaultWallpaperSmall, |
168 ash::switches::kAshGuestWallpaperLarge, | 171 ash::switches::kAshGuestWallpaperLarge, |
169 ash::switches::kAshGuestWallpaperSmall, | 172 ash::switches::kAshGuestWallpaperSmall, |
170 ash::switches::kAshHostWindowBounds, | 173 ash::switches::kAshHostWindowBounds, |
171 ash::switches::kAshTouchHud, | 174 ash::switches::kAshTouchHud, |
172 ash::switches::kAuraLegacyPowerButton, | 175 ash::switches::kAuraLegacyPowerButton, |
173 // Please keep these in alphabetical order. Non-UI Compositor switches | 176 // Please keep these in alphabetical order. Non-UI Compositor switches |
174 // here should also be added to | 177 // here should also be added to |
175 // content/browser/renderer_host/render_process_host_impl.cc. | 178 // content/browser/renderer_host/render_process_host_impl.cc. |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 // Relaunch chrome without session manager on dev box. | 370 // Relaunch chrome without session manager on dev box. |
368 ReLaunch(command_line); | 371 ReLaunch(command_line); |
369 return; | 372 return; |
370 } | 373 } |
371 | 374 |
372 // ChromeRestartRequest deletes itself after request sent to session manager. | 375 // ChromeRestartRequest deletes itself after request sent to session manager. |
373 (new ChromeRestartRequest(command_line))->Start(); | 376 (new ChromeRestartRequest(command_line))->Start(); |
374 } | 377 } |
375 | 378 |
376 } // namespace chromeos | 379 } // namespace chromeos |
OLD | NEW |