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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 67 DCHECK_NE(&base_command_line, command_line); | 67 DCHECK_NE(&base_command_line, command_line); |
| 68 | 68 |
| 69 static const char* kForwardSwitches[] = { | 69 static const char* kForwardSwitches[] = { |
| 70 ::switches::kAllowWebUICompositing, | 70 ::switches::kAllowWebUICompositing, |
| 71 ::switches::kDeviceManagementUrl, | 71 ::switches::kDeviceManagementUrl, |
| 72 ::switches::kDisableAccelerated2dCanvas, | 72 ::switches::kDisableAccelerated2dCanvas, |
| 73 ::switches::kDisableAcceleratedOverflowScroll, | 73 ::switches::kDisableAcceleratedOverflowScroll, |
| 74 ::switches::kDisableAcceleratedPlugins, | 74 ::switches::kDisableAcceleratedPlugins, |
| 75 ::switches::kDisableAcceleratedVideoDecode, | 75 ::switches::kDisableAcceleratedVideoDecode, |
| 76 ::switches::kDisableBrowserPluginCompositing, | 76 ::switches::kDisableBrowserPluginCompositing, |
| 77 ::switches::kDisableEncryptedMedia, | |
| 78 ::switches::kDisableForceCompositingMode, | 77 ::switches::kDisableForceCompositingMode, |
| 79 ::switches::kDisableGpuShaderDiskCache, | 78 ::switches::kDisableGpuShaderDiskCache, |
| 80 ::switches::kDisableGpuWatchdog, | 79 ::switches::kDisableGpuWatchdog, |
| 80 ::switches::kDisableLegacyEncryptedMedia, | |
| 81 ::switches::kDisablePanelFitting, | 81 ::switches::kDisablePanelFitting, |
| 82 ::switches::kDisableSeccompFilterSandbox, | 82 ::switches::kDisableSeccompFilterSandbox, |
| 83 ::switches::kDisableThreadedCompositing, | 83 ::switches::kDisableThreadedCompositing, |
| 84 ::switches::kDisableTouchDragDrop, | 84 ::switches::kDisableTouchDragDrop, |
| 85 ::switches::kDisableTouchEditing, | 85 ::switches::kDisableTouchEditing, |
| 86 ::switches::kDisableWebKitMediaSource, | |
|
xhwang
2013/05/20 16:59:51
Is this something left over in acolwell@'s CL?
ddorwin
2013/05/20 18:12:17
This is his switch, but he didn't add it here. I'm
| |
| 86 ::switches::kEnableAcceleratedOverflowScroll, | 87 ::switches::kEnableAcceleratedOverflowScroll, |
| 87 ::switches::kEnableCompositingForFixedPosition, | 88 ::switches::kEnableCompositingForFixedPosition, |
| 89 ::switches::kEnableEncryptedMedia, | |
| 88 ::switches::kEnableGestureTapHighlight, | 90 ::switches::kEnableGestureTapHighlight, |
| 89 ::switches::kDisableGestureTapHighlight, | 91 ::switches::kDisableGestureTapHighlight, |
| 90 ::switches::kDisableGpuSandbox, | 92 ::switches::kDisableGpuSandbox, |
| 91 ::switches::kEnableGpuSandbox, | 93 ::switches::kEnableGpuSandbox, |
| 92 ::switches::kEnableLogging, | 94 ::switches::kEnableLogging, |
| 93 ::switches::kEnablePinch, | 95 ::switches::kEnablePinch, |
| 94 ::switches::kEnableThreadedCompositing, | 96 ::switches::kEnableThreadedCompositing, |
| 95 ::switches::kEnableTouchDragDrop, | 97 ::switches::kEnableTouchDragDrop, |
| 96 ::switches::kEnableTouchEditing, | 98 ::switches::kEnableTouchEditing, |
| 97 ::switches::kEnableViewport, | 99 ::switches::kEnableViewport, |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 333 // Relaunch chrome without session manager on dev box. | 335 // Relaunch chrome without session manager on dev box. |
| 334 ReLaunch(command_line); | 336 ReLaunch(command_line); |
| 335 return; | 337 return; |
| 336 } | 338 } |
| 337 | 339 |
| 338 // ChromeRestartRequest deletes itself after request sent to session manager. | 340 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 339 (new ChromeRestartRequest(command_line))->Start(); | 341 (new ChromeRestartRequest(command_line))->Start(); |
| 340 } | 342 } |
| 341 | 343 |
| 342 } // namespace chromeos | 344 } // namespace chromeos |
| OLD | NEW |