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/chromeos/chromeos_version.h" | 10 #include "base/chromeos/chromeos_version.h" |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 cc::switches::kUIEnablePerTilePainting, | 179 cc::switches::kUIEnablePerTilePainting, |
180 cc::switches::kUseMapImage, | 180 cc::switches::kUseMapImage, |
181 chromeos::switches::kDbusStub, | 181 chromeos::switches::kDbusStub, |
182 chromeos::switches::kDisableLoginAnimations, | 182 chromeos::switches::kDisableLoginAnimations, |
183 chromeos::switches::kDisableOobeAnimation, | 183 chromeos::switches::kDisableOobeAnimation, |
184 chromeos::switches::kHasChromeOSDiamondKey, | 184 chromeos::switches::kHasChromeOSDiamondKey, |
185 chromeos::switches::kHasChromeOSKeyboard, | 185 chromeos::switches::kHasChromeOSKeyboard, |
186 chromeos::switches::kLoginProfile, | 186 chromeos::switches::kLoginProfile, |
187 chromeos::switches::kNaturalScrollDefault, | 187 chromeos::switches::kNaturalScrollDefault, |
188 chromeos::switches::kUseNewNetworkConfigurationHandlers, | 188 chromeos::switches::kUseNewNetworkConfigurationHandlers, |
189 chromeos::switches::kUseNewNetworkConnectionHandler, | |
190 gfx::switches::kEnableBrowserTextSubpixelPositioning, | 189 gfx::switches::kEnableBrowserTextSubpixelPositioning, |
191 gfx::switches::kEnableWebkitTextSubpixelPositioning, | 190 gfx::switches::kEnableWebkitTextSubpixelPositioning, |
192 views::corewm::switches::kNoDropShadows, | 191 views::corewm::switches::kNoDropShadows, |
193 views::corewm::switches::kWindowAnimationsDisabled, | 192 views::corewm::switches::kWindowAnimationsDisabled, |
194 }; | 193 }; |
195 command_line->CopySwitchesFrom(base_command_line, | 194 command_line->CopySwitchesFrom(base_command_line, |
196 kForwardSwitches, | 195 kForwardSwitches, |
197 arraysize(kForwardSwitches)); | 196 arraysize(kForwardSwitches)); |
198 | 197 |
199 if (start_url.is_valid()) | 198 if (start_url.is_valid()) |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 // Relaunch chrome without session manager on dev box. | 353 // Relaunch chrome without session manager on dev box. |
355 ReLaunch(command_line); | 354 ReLaunch(command_line); |
356 return; | 355 return; |
357 } | 356 } |
358 | 357 |
359 // ChromeRestartRequest deletes itself after request sent to session manager. | 358 // ChromeRestartRequest deletes itself after request sent to session manager. |
360 (new ChromeRestartRequest(command_line))->Start(); | 359 (new ChromeRestartRequest(command_line))->Start(); |
361 } | 360 } |
362 | 361 |
363 } // namespace chromeos | 362 } // namespace chromeos |
OLD | NEW |