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 "third_party/cros_system_api/switches/chrome_switches.h" |
38 #include "ui/app_list/app_list_switches.h" | 39 #include "ui/app_list/app_list_switches.h" |
39 #include "ui/base/ui_base_switches.h" | 40 #include "ui/base/ui_base_switches.h" |
40 #include "ui/compositor/compositor_switches.h" | 41 #include "ui/compositor/compositor_switches.h" |
41 #include "ui/events/event_switches.h" | 42 #include "ui/events/event_switches.h" |
42 #include "ui/gfx/switches.h" | 43 #include "ui/gfx/switches.h" |
43 #include "ui/gl/gl_switches.h" | 44 #include "ui/gl/gl_switches.h" |
44 #include "ui/ozone/ozone_switches.h" | 45 #include "ui/ozone/ozone_switches.h" |
45 #include "ui/wm/core/wm_core_switches.h" | 46 #include "ui/wm/core/wm_core_switches.h" |
46 #include "url/gurl.h" | 47 #include "url/gurl.h" |
47 | 48 |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 cc::switches::kShowScreenSpaceRects, | 199 cc::switches::kShowScreenSpaceRects, |
199 cc::switches::kShowSurfaceDamageRects, | 200 cc::switches::kShowSurfaceDamageRects, |
200 cc::switches::kSlowDownRasterScaleFactor, | 201 cc::switches::kSlowDownRasterScaleFactor, |
201 cc::switches::kUIDisablePartialSwap, | 202 cc::switches::kUIDisablePartialSwap, |
202 chromeos::switches::kDbusStub, | 203 chromeos::switches::kDbusStub, |
203 chromeos::switches::kDisableLoginAnimations, | 204 chromeos::switches::kDisableLoginAnimations, |
204 chromeos::switches::kHasChromeOSDiamondKey, | 205 chromeos::switches::kHasChromeOSDiamondKey, |
205 chromeos::switches::kHasChromeOSKeyboard, | 206 chromeos::switches::kHasChromeOSKeyboard, |
206 chromeos::switches::kLoginProfile, | 207 chromeos::switches::kLoginProfile, |
207 chromeos::switches::kNaturalScrollDefault, | 208 chromeos::switches::kNaturalScrollDefault, |
| 209 chromeos::switches::kSystemInDevMode, |
208 ::switches::kEnableBrowserTextSubpixelPositioning, | 210 ::switches::kEnableBrowserTextSubpixelPositioning, |
209 ::switches::kEnableWebkitTextSubpixelPositioning, | 211 ::switches::kEnableWebkitTextSubpixelPositioning, |
210 policy::switches::kDeviceManagementUrl, | 212 policy::switches::kDeviceManagementUrl, |
211 wm::switches::kWindowAnimationsDisabled, | 213 wm::switches::kWindowAnimationsDisabled, |
212 }; | 214 }; |
213 command_line->CopySwitchesFrom(base_command_line, | 215 command_line->CopySwitchesFrom(base_command_line, |
214 kForwardSwitches, | 216 kForwardSwitches, |
215 arraysize(kForwardSwitches)); | 217 arraysize(kForwardSwitches)); |
216 | 218 |
217 if (start_url.is_valid()) | 219 if (start_url.is_valid()) |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 // Relaunch chrome without session manager on dev box. | 372 // Relaunch chrome without session manager on dev box. |
371 ReLaunch(command_line); | 373 ReLaunch(command_line); |
372 return; | 374 return; |
373 } | 375 } |
374 | 376 |
375 // ChromeRestartRequest deletes itself after request sent to session manager. | 377 // ChromeRestartRequest deletes itself after request sent to session manager. |
376 (new ChromeRestartRequest(command_line))->Start(); | 378 (new ChromeRestartRequest(command_line))->Start(); |
377 } | 379 } |
378 | 380 |
379 } // namespace chromeos | 381 } // namespace chromeos |
OLD | NEW |