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