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

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

Issue 52223002: Revert 231699 "Remove kNaturalScrollDefault." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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/command_line.h" 10 #include "base/command_line.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 cc::switches::kSlowDownRasterScaleFactor, 186 cc::switches::kSlowDownRasterScaleFactor,
187 cc::switches::kTraceOverdraw, 187 cc::switches::kTraceOverdraw,
188 cc::switches::kUIDisablePartialSwap, 188 cc::switches::kUIDisablePartialSwap,
189 cc::switches::kUIEnablePerTilePainting, 189 cc::switches::kUIEnablePerTilePainting,
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 ::switches::kEnableBrowserTextSubpixelPositioning, 197 ::switches::kEnableBrowserTextSubpixelPositioning,
197 ::switches::kEnableWebkitTextSubpixelPositioning, 198 ::switches::kEnableWebkitTextSubpixelPositioning,
198 views::corewm::switches::kNoDropShadows, 199 views::corewm::switches::kNoDropShadows,
199 views::corewm::switches::kWindowAnimationsDisabled, 200 views::corewm::switches::kWindowAnimationsDisabled,
200 }; 201 };
201 command_line->CopySwitchesFrom(base_command_line, 202 command_line->CopySwitchesFrom(base_command_line,
202 kForwardSwitches, 203 kForwardSwitches,
203 arraysize(kForwardSwitches)); 204 arraysize(kForwardSwitches));
204 205
205 if (start_url.is_valid()) 206 if (start_url.is_valid())
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 // Relaunch chrome without session manager on dev box. 361 // Relaunch chrome without session manager on dev box.
361 ReLaunch(command_line); 362 ReLaunch(command_line);
362 return; 363 return;
363 } 364 }
364 365
365 // ChromeRestartRequest deletes itself after request sent to session manager. 366 // ChromeRestartRequest deletes itself after request sent to session manager.
366 (new ChromeRestartRequest(command_line))->Start(); 367 (new ChromeRestartRequest(command_line))->Start();
367 } 368 }
368 369
369 } // namespace chromeos 370 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698