| 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  190       chromeos::switches::kDbusStub, |  190       chromeos::switches::kDbusStub, | 
|  191       chromeos::switches::kDisableLoginAnimations, |  191       chromeos::switches::kDisableLoginAnimations, | 
|  192       chromeos::switches::kDisableOobeAnimation, |  192       chromeos::switches::kDisableOobeAnimation, | 
|  193       chromeos::switches::kHasChromeOSDiamondKey, |  193       chromeos::switches::kHasChromeOSDiamondKey, | 
|  194       chromeos::switches::kHasChromeOSKeyboard, |  194       chromeos::switches::kHasChromeOSKeyboard, | 
|  195       chromeos::switches::kLoginProfile, |  195       chromeos::switches::kLoginProfile, | 
|  196       chromeos::switches::kNaturalScrollDefault, |  196       chromeos::switches::kNaturalScrollDefault, | 
|  197       ::switches::kEnableBrowserTextSubpixelPositioning, |  197       ::switches::kEnableBrowserTextSubpixelPositioning, | 
|  198       ::switches::kEnableWebkitTextSubpixelPositioning, |  198       ::switches::kEnableWebkitTextSubpixelPositioning, | 
|  199       policy::switches::kDeviceManagementUrl, |  199       policy::switches::kDeviceManagementUrl, | 
|  200       views::corewm::switches::kWindowAnimationsDisabled, |  200       wm::switches::kWindowAnimationsDisabled, | 
|  201   }; |  201   }; | 
|  202   command_line->CopySwitchesFrom(base_command_line, |  202   command_line->CopySwitchesFrom(base_command_line, | 
|  203                                  kForwardSwitches, |  203                                  kForwardSwitches, | 
|  204                                  arraysize(kForwardSwitches)); |  204                                  arraysize(kForwardSwitches)); | 
|  205  |  205  | 
|  206   if (start_url.is_valid()) |  206   if (start_url.is_valid()) | 
|  207     command_line->AppendArg(start_url.spec()); |  207     command_line->AppendArg(start_url.spec()); | 
|  208  |  208  | 
|  209   for (base::DictionaryValue::Iterator it(new_switches); |  209   for (base::DictionaryValue::Iterator it(new_switches); | 
|  210        !it.IsAtEnd(); |  210        !it.IsAtEnd(); | 
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  352     // Relaunch chrome without session manager on dev box. |  352     // Relaunch chrome without session manager on dev box. | 
|  353     ReLaunch(command_line); |  353     ReLaunch(command_line); | 
|  354     return; |  354     return; | 
|  355   } |  355   } | 
|  356  |  356  | 
|  357   // ChromeRestartRequest deletes itself after request sent to session manager. |  357   // ChromeRestartRequest deletes itself after request sent to session manager. | 
|  358   (new ChromeRestartRequest(command_line))->Start(); |  358   (new ChromeRestartRequest(command_line))->Start(); | 
|  359 } |  359 } | 
|  360  |  360  | 
|  361 }  // namespace chromeos |  361 }  // namespace chromeos | 
| OLD | NEW |