Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Side by Side Diff: chrome/browser/chromeos/login/chrome_restart_request.cc

Issue 21046008: Convert all connect code to use NetworkHandler instead of NetworkLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add NetworkConfigurationHandler::SetNetworkProfile Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 cc::switches::kUIEnablePerTilePainting, 178 cc::switches::kUIEnablePerTilePainting,
179 cc::switches::kUseMapImage, 179 cc::switches::kUseMapImage,
180 chromeos::switches::kDbusStub, 180 chromeos::switches::kDbusStub,
181 chromeos::switches::kDisableLoginAnimations, 181 chromeos::switches::kDisableLoginAnimations,
182 chromeos::switches::kDisableOobeAnimation, 182 chromeos::switches::kDisableOobeAnimation,
183 chromeos::switches::kHasChromeOSDiamondKey, 183 chromeos::switches::kHasChromeOSDiamondKey,
184 chromeos::switches::kHasChromeOSKeyboard, 184 chromeos::switches::kHasChromeOSKeyboard,
185 chromeos::switches::kLoginProfile, 185 chromeos::switches::kLoginProfile,
186 chromeos::switches::kNaturalScrollDefault, 186 chromeos::switches::kNaturalScrollDefault,
187 chromeos::switches::kUseNewNetworkConfigurationHandlers, 187 chromeos::switches::kUseNewNetworkConfigurationHandlers,
188 chromeos::switches::kUseNewNetworkConnectionHandler,
189 gfx::switches::kEnableBrowserTextSubpixelPositioning, 188 gfx::switches::kEnableBrowserTextSubpixelPositioning,
190 gfx::switches::kEnableWebkitTextSubpixelPositioning, 189 gfx::switches::kEnableWebkitTextSubpixelPositioning,
191 views::corewm::switches::kNoDropShadows, 190 views::corewm::switches::kNoDropShadows,
192 views::corewm::switches::kWindowAnimationsDisabled, 191 views::corewm::switches::kWindowAnimationsDisabled,
193 }; 192 };
194 command_line->CopySwitchesFrom(base_command_line, 193 command_line->CopySwitchesFrom(base_command_line,
195 kForwardSwitches, 194 kForwardSwitches,
196 arraysize(kForwardSwitches)); 195 arraysize(kForwardSwitches));
197 196
198 if (start_url.is_valid()) 197 if (start_url.is_valid())
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 // Relaunch chrome without session manager on dev box. 352 // Relaunch chrome without session manager on dev box.
354 ReLaunch(command_line); 353 ReLaunch(command_line);
355 return; 354 return;
356 } 355 }
357 356
358 // ChromeRestartRequest deletes itself after request sent to session manager. 357 // ChromeRestartRequest deletes itself after request sent to session manager.
359 (new ChromeRestartRequest(command_line))->Start(); 358 (new ChromeRestartRequest(command_line))->Start();
360 } 359 }
361 360
362 } // namespace chromeos 361 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698