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

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: Rebase 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 cc::switches::kUIEnablePerTilePainting, 176 cc::switches::kUIEnablePerTilePainting,
177 cc::switches::kUseMapImage, 177 cc::switches::kUseMapImage,
178 chromeos::switches::kDbusStub, 178 chromeos::switches::kDbusStub,
179 chromeos::switches::kDisableLoginAnimations, 179 chromeos::switches::kDisableLoginAnimations,
180 chromeos::switches::kDisableOobeAnimation, 180 chromeos::switches::kDisableOobeAnimation,
181 chromeos::switches::kHasChromeOSDiamondKey, 181 chromeos::switches::kHasChromeOSDiamondKey,
182 chromeos::switches::kHasChromeOSKeyboard, 182 chromeos::switches::kHasChromeOSKeyboard,
183 chromeos::switches::kLoginProfile, 183 chromeos::switches::kLoginProfile,
184 chromeos::switches::kNaturalScrollDefault, 184 chromeos::switches::kNaturalScrollDefault,
185 chromeos::switches::kUseNewNetworkConfigurationHandlers, 185 chromeos::switches::kUseNewNetworkConfigurationHandlers,
186 chromeos::switches::kUseNewNetworkConnectionHandler,
187 gfx::switches::kEnableBrowserTextSubpixelPositioning, 186 gfx::switches::kEnableBrowserTextSubpixelPositioning,
188 gfx::switches::kEnableWebkitTextSubpixelPositioning, 187 gfx::switches::kEnableWebkitTextSubpixelPositioning,
189 views::corewm::switches::kNoDropShadows, 188 views::corewm::switches::kNoDropShadows,
190 views::corewm::switches::kWindowAnimationsDisabled, 189 views::corewm::switches::kWindowAnimationsDisabled,
191 }; 190 };
192 command_line->CopySwitchesFrom(base_command_line, 191 command_line->CopySwitchesFrom(base_command_line,
193 kForwardSwitches, 192 kForwardSwitches,
194 arraysize(kForwardSwitches)); 193 arraysize(kForwardSwitches));
195 194
196 if (start_url.is_valid()) 195 if (start_url.is_valid())
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 // Relaunch chrome without session manager on dev box. 350 // Relaunch chrome without session manager on dev box.
352 ReLaunch(command_line); 351 ReLaunch(command_line);
353 return; 352 return;
354 } 353 }
355 354
356 // ChromeRestartRequest deletes itself after request sent to session manager. 355 // ChromeRestartRequest deletes itself after request sent to session manager.
357 (new ChromeRestartRequest(command_line))->Start(); 356 (new ChromeRestartRequest(command_line))->Start();
358 } 357 }
359 358
360 } // namespace chromeos 359 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/enrollment_dialog_view.cc ('k') | chrome/browser/chromeos/mobile/mobile_activator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698