trunk/src/chrome/browser/chromeos/login/chrome_restart_request.cc - Issue 14439009: Revert 196446 "Make touch drag drop and touch editing flags tri-..."

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

Issue 14439009: Revert 196446 "Make touch drag drop and touch editing flags tri-..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 8 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

Property Changes:

Added: svn:mergeinfo

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 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77 ::switches::kDisableEncryptedMedia,	77 ::switches::kDisableEncryptedMedia,

78 ::switches::kDisableForceCompositingMode,	78 ::switches::kDisableForceCompositingMode,

79 ::switches::kDisableGpuShaderDiskCache,	79 ::switches::kDisableGpuShaderDiskCache,

80 ::switches::kDisableGpuWatchdog,	80 ::switches::kDisableGpuWatchdog,

81 ::switches::kDisableLoginAnimations,	81 ::switches::kDisableLoginAnimations,

82 ::switches::kDisableOobeAnimation,	82 ::switches::kDisableOobeAnimation,

83 ::switches::kDisablePanelFitting,	83 ::switches::kDisablePanelFitting,

84 ::switches::kDisableSeccompFilterSandbox,	84 ::switches::kDisableSeccompFilterSandbox,

85 ::switches::kDisableSeccompSandbox,	85 ::switches::kDisableSeccompSandbox,

86 ::switches::kDisableThreadedCompositing,	86 ::switches::kDisableThreadedCompositing,

87 ::switches::kDisableTouchDragDrop,

88 ::switches::kDisableTouchEditing,

89 ::switches::kEnableAcceleratedOverflowScroll,	87 ::switches::kEnableAcceleratedOverflowScroll,

90 ::switches::kEnableCompositingForFixedPosition,	88 ::switches::kEnableCompositingForFixedPosition,

91 ::switches::kEnableGestureTapHighlight,	89 ::switches::kEnableGestureTapHighlight,

92 ::switches::kDisableGestureTapHighlight,	90 ::switches::kDisableGestureTapHighlight,

93 ::switches::kDisableGpuSandbox,	91 ::switches::kDisableGpuSandbox,

94 ::switches::kEnableGpuSandbox,	92 ::switches::kEnableGpuSandbox,

95 ::switches::kEnableLogging,	93 ::switches::kEnableLogging,

96 ::switches::kEnablePinch,	94 ::switches::kEnablePinch,

97 ::switches::kEnableThreadedCompositing,	95 ::switches::kEnableThreadedCompositing,

98 ::switches::kEnableTouchDragDrop,

99 ::switches::kEnableTouchEditing,

100 ::switches::kEnableViewport,	96 ::switches::kEnableViewport,

101 ::switches::kEnableVsyncNotification,	97 ::switches::kEnableVsyncNotification,

102 ::switches::kForceDeviceScaleFactor,	98 ::switches::kForceDeviceScaleFactor,

103 ::switches::kGpuStartupDialog,	99 ::switches::kGpuStartupDialog,

104 ::switches::kHasChromeOSDiamondKey,	100 ::switches::kHasChromeOSDiamondKey,

105 ::switches::kHasChromeOSKeyboard,	101 ::switches::kHasChromeOSKeyboard,

106 ::switches::kNaturalScrollDefault,	102 ::switches::kNaturalScrollDefault,

107 ::switches::kNoSandbox,	103 ::switches::kNoSandbox,

108 ::switches::kPpapiFlashArgs,	104 ::switches::kPpapiFlashArgs,

109 ::switches::kPpapiFlashInProcess,	105 ::switches::kPpapiFlashInProcess,

(...skipping 226 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
336 // Relaunch chrome without session manager on dev box.	332 // Relaunch chrome without session manager on dev box.

337 ReLaunch(command_line);	333 ReLaunch(command_line);

338 return;	334 return;

339 }	335 }

340	336

341 // ChromeRestartRequest deletes itself after request sent to session manager.	337 // ChromeRestartRequest deletes itself after request sent to session manager.

342 (new ChromeRestartRequest(command_line))->Start();	338 (new ChromeRestartRequest(command_line))->Start();

343 }	339 }

344	340

345 } // namespace chromeos	341 } // namespace chromeos

OLD	NEW

« no previous file with comments | « trunk/src/chrome/browser/about_flags.cc ('k') | trunk/src/content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »