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 24 matching lines...) Expand all Loading... |
35 #include "components/prefs/json_pref_store.h" | 35 #include "components/prefs/json_pref_store.h" |
36 #include "components/prefs/pref_service.h" | 36 #include "components/prefs/pref_service.h" |
37 #include "components/signin/core/account_id/account_id.h" | 37 #include "components/signin/core/account_id/account_id.h" |
38 #include "components/tracing/common/tracing_switches.h" | 38 #include "components/tracing/common/tracing_switches.h" |
39 #include "components/user_manager/user_names.h" | 39 #include "components/user_manager/user_names.h" |
40 #include "content/public/browser/browser_thread.h" | 40 #include "content/public/browser/browser_thread.h" |
41 #include "content/public/common/content_switches.h" | 41 #include "content/public/common/content_switches.h" |
42 #include "gpu/command_buffer/service/gpu_switches.h" | 42 #include "gpu/command_buffer/service/gpu_switches.h" |
43 #include "gpu/ipc/service/switches.h" | 43 #include "gpu/ipc/service/switches.h" |
44 #include "media/base/media_switches.h" | 44 #include "media/base/media_switches.h" |
| 45 #include "media/media_features.h" |
45 #include "third_party/cros_system_api/switches/chrome_switches.h" | 46 #include "third_party/cros_system_api/switches/chrome_switches.h" |
46 #include "ui/app_list/app_list_switches.h" | 47 #include "ui/app_list/app_list_switches.h" |
47 #include "ui/base/ui_base_switches.h" | 48 #include "ui/base/ui_base_switches.h" |
48 #include "ui/compositor/compositor_switches.h" | 49 #include "ui/compositor/compositor_switches.h" |
49 #include "ui/display/display_switches.h" | 50 #include "ui/display/display_switches.h" |
50 #include "ui/events/event_switches.h" | 51 #include "ui/events/event_switches.h" |
51 #include "ui/gfx/switches.h" | 52 #include "ui/gfx/switches.h" |
52 #include "ui/gl/gl_switches.h" | 53 #include "ui/gl/gl_switches.h" |
53 #include "ui/ozone/public/ozone_switches.h" | 54 #include "ui/ozone/public/ozone_switches.h" |
54 #include "ui/wm/core/wm_core_switches.h" | 55 #include "ui/wm/core/wm_core_switches.h" |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 ::switches::kUseCras, | 159 ::switches::kUseCras, |
159 #endif | 160 #endif |
160 ::switches::kUseGL, | 161 ::switches::kUseGL, |
161 ::switches::kUserDataDir, | 162 ::switches::kUserDataDir, |
162 ::switches::kV, | 163 ::switches::kV, |
163 ::switches::kVModule, | 164 ::switches::kVModule, |
164 ::switches::kEnableWebGLDraftExtensions, | 165 ::switches::kEnableWebGLDraftExtensions, |
165 ::switches::kDisableWebGLImageChromium, | 166 ::switches::kDisableWebGLImageChromium, |
166 ::switches::kEnableWebGLImageChromium, | 167 ::switches::kEnableWebGLImageChromium, |
167 ::switches::kEnableWebVR, | 168 ::switches::kEnableWebVR, |
168 #if defined(ENABLE_WEBRTC) | 169 #if BUILDFLAG(ENABLE_WEBRTC) |
169 ::switches::kDisableWebRtcHWDecoding, | 170 ::switches::kDisableWebRtcHWDecoding, |
170 ::switches::kDisableWebRtcHWEncoding, | 171 ::switches::kDisableWebRtcHWEncoding, |
171 #endif | 172 #endif |
172 ::switches::kDisableVaapiAcceleratedVideoEncode, | 173 ::switches::kDisableVaapiAcceleratedVideoEncode, |
173 #if defined(USE_OZONE) | 174 #if defined(USE_OZONE) |
174 ::switches::kOzonePlatform, | 175 ::switches::kOzonePlatform, |
175 #endif | 176 #endif |
176 app_list::switches::kDisableSyncAppList, | 177 app_list::switches::kDisableSyncAppList, |
177 app_list::switches::kEnableSyncAppList, | 178 app_list::switches::kEnableSyncAppList, |
178 ash::switches::kAshEnableTabletPowerButton, | 179 ash::switches::kAshEnableTabletPowerButton, |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 // Relaunch chrome without session manager on dev box. | 388 // Relaunch chrome without session manager on dev box. |
388 ReLaunch(command_line); | 389 ReLaunch(command_line); |
389 return; | 390 return; |
390 } | 391 } |
391 | 392 |
392 // ChromeRestartRequest deletes itself after request sent to session manager. | 393 // ChromeRestartRequest deletes itself after request sent to session manager. |
393 (new ChromeRestartRequest(command_line.argv()))->Start(); | 394 (new ChromeRestartRequest(command_line.argv()))->Start(); |
394 } | 395 } |
395 | 396 |
396 } // namespace chromeos | 397 } // namespace chromeos |
OLD | NEW |