Chromium Code Reviews| 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/chromeos/chromeos_version.h" | 10 #include "base/chromeos/chromeos_version.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 84 ::switches::kDisableSeccompFilterSandbox, | 84 ::switches::kDisableSeccompFilterSandbox, |
| 85 ::switches::kDisableSeccompSandbox, | 85 ::switches::kDisableSeccompSandbox, |
| 86 ::switches::kDisableThreadedCompositing, | 86 ::switches::kDisableThreadedCompositing, |
| 87 ::switches::kEnableAcceleratedOverflowScroll, | 87 ::switches::kEnableAcceleratedOverflowScroll, |
| 88 ::switches::kEnableCompositingForFixedPosition, | 88 ::switches::kEnableCompositingForFixedPosition, |
| 89 ::switches::kEnableGestureTapHighlight, | 89 ::switches::kEnableGestureTapHighlight, |
| 90 ::switches::kDisableGestureTapHighlight, | 90 ::switches::kDisableGestureTapHighlight, |
| 91 ::switches::kEnableLogging, | 91 ::switches::kEnableLogging, |
| 92 ::switches::kEnablePinch, | 92 ::switches::kEnablePinch, |
| 93 ::switches::kEnableThreadedCompositing, | 93 ::switches::kEnableThreadedCompositing, |
| 94 ::switches::kEnableTouchDragDrop, | |
| 95 ::switches::kDisableTouchDragDrop, | |
|
sky
2013/04/24 14:44:23
Keep these sorted.
varunjain
2013/04/24 18:09:25
Done.
| |
| 96 ::switches::kEnableTouchEditing, | |
| 97 ::switches::kDisableTouchEditing, | |
| 94 ::switches::kEnableViewport, | 98 ::switches::kEnableViewport, |
| 95 ::switches::kEnableVsyncNotification, | 99 ::switches::kEnableVsyncNotification, |
| 96 ::switches::kForceDeviceScaleFactor, | 100 ::switches::kForceDeviceScaleFactor, |
| 97 ::switches::kGpuStartupDialog, | 101 ::switches::kGpuStartupDialog, |
| 98 ::switches::kHasChromeOSDiamondKey, | 102 ::switches::kHasChromeOSDiamondKey, |
| 99 ::switches::kHasChromeOSKeyboard, | 103 ::switches::kHasChromeOSKeyboard, |
| 100 ::switches::kNaturalScrollDefault, | 104 ::switches::kNaturalScrollDefault, |
| 101 ::switches::kNoSandbox, | 105 ::switches::kNoSandbox, |
| 102 ::switches::kPpapiFlashArgs, | 106 ::switches::kPpapiFlashArgs, |
| 103 ::switches::kPpapiFlashInProcess, | 107 ::switches::kPpapiFlashInProcess, |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 329 // Relaunch chrome without session manager on dev box. | 333 // Relaunch chrome without session manager on dev box. |
| 330 ReLaunch(command_line); | 334 ReLaunch(command_line); |
| 331 return; | 335 return; |
| 332 } | 336 } |
| 333 | 337 |
| 334 // ChromeRestartRequest deletes itself after request sent to session manager. | 338 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 335 (new ChromeRestartRequest(command_line))->Start(); | 339 (new ChromeRestartRequest(command_line))->Start(); |
| 336 } | 340 } |
| 337 | 341 |
| 338 } // namespace chromeos | 342 } // namespace chromeos |
| OLD | NEW |