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

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

Issue 12548014: Enable ash new network status area by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests, ash_shell Created 7 years, 9 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 ::switches::kUIEnableThreadedCompositing, 113 ::switches::kUIEnableThreadedCompositing,
114 ::switches::kUIPrioritizeInGpuProcess, 114 ::switches::kUIPrioritizeInGpuProcess,
115 #if defined(USE_CRAS) 115 #if defined(USE_CRAS)
116 ::switches::kUseCras, 116 ::switches::kUseCras,
117 #endif 117 #endif
118 ::switches::kUseGL, 118 ::switches::kUseGL,
119 ::switches::kUserDataDir, 119 ::switches::kUserDataDir,
120 ::switches::kUseExynosVda, 120 ::switches::kUseExynosVda,
121 ash::switches::kAshTouchHud, 121 ash::switches::kAshTouchHud,
122 ash::switches::kAuraLegacyPowerButton, 122 ash::switches::kAuraLegacyPowerButton,
123 ash::switches::kAshEnableNewNetworkStatusArea, 123 ash::switches::kAshDisableNewNetworkStatusArea,
124 cc::switches::kDisableThreadedAnimation, 124 cc::switches::kDisableThreadedAnimation,
125 cc::switches::kEnablePartialSwap, 125 cc::switches::kEnablePartialSwap,
126 chromeos::switches::kDbusStub, 126 chromeos::switches::kDbusStub,
127 gfx::switches::kEnableBrowserTextSubpixelPositioning, 127 gfx::switches::kEnableBrowserTextSubpixelPositioning,
128 gfx::switches::kEnableWebkitTextSubpixelPositioning, 128 gfx::switches::kEnableWebkitTextSubpixelPositioning,
129 views::corewm::switches::kNoDropShadows, 129 views::corewm::switches::kNoDropShadows,
130 views::corewm::switches::kWindowAnimationsDisabled, 130 views::corewm::switches::kWindowAnimationsDisabled,
131 }; 131 };
132 command_line->CopySwitchesFrom(base_command_line, 132 command_line->CopySwitchesFrom(base_command_line,
133 kForwardSwitches, 133 kForwardSwitches,
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 // Relaunch chrome without session manager on dev box. 310 // Relaunch chrome without session manager on dev box.
311 ReLaunch(command_line); 311 ReLaunch(command_line);
312 return; 312 return;
313 } 313 }
314 314
315 // ChromeRestartRequest deletes itself after request sent to session manager. 315 // ChromeRestartRequest deletes itself after request sent to session manager.
316 (new ChromeRestartRequest(command_line))->Start(); 316 (new ChromeRestartRequest(command_line))->Start();
317 } 317 }
318 318
319 } // namespace chromeos 319 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698