| Index: chrome/browser/chromeos/login/chrome_restart_request.cc
|
| diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
|
| index b8ba804bfe18bdf17500fc33b7a307bbb6db9573..22ffe0253eed5cc83108c992d7dc2e702505e95b 100644
|
| --- a/chrome/browser/chromeos/login/chrome_restart_request.cc
|
| +++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
|
| @@ -66,137 +66,139 @@ std::string DeriveCommandLine(const GURL& start_url,
|
| DCHECK_NE(&base_command_line, command_line);
|
|
|
| static const char* kForwardSwitches[] = {
|
| - ::switches::kDisableAccelerated2dCanvas,
|
| - ::switches::kDisableAcceleratedOverflowScroll,
|
| - ::switches::kDisableAcceleratedVideoDecode,
|
| - ::switches::kDisableBrowserPluginCompositing,
|
| - ::switches::kDisableDelegatedRenderer,
|
| - ::switches::kDisableFiltersOverIPC,
|
| - ::switches::kDisableForceCompositingMode,
|
| - ::switches::kDisableGpuShaderDiskCache,
|
| - ::switches::kDisableGpuWatchdog,
|
| - ::switches::kDisableGpuCompositing,
|
| - ::switches::kDisableGpuRasterization,
|
| - ::switches::kDisableImplSidePainting,
|
| - ::switches::kDisableMapImage,
|
| - ::switches::kDisablePrefixedEncryptedMedia,
|
| - ::switches::kDisablePanelFitting,
|
| - ::switches::kDisableRepaintAfterLayout,
|
| - ::switches::kDisableSeccompFilterSandbox,
|
| - ::switches::kDisableSetuidSandbox,
|
| - ::switches::kDisableThreadedCompositing,
|
| - ::switches::kDisableTouchDragDrop,
|
| - ::switches::kDisableTouchEditing,
|
| - ::switches::kDisableUniversalAcceleratedOverflowScroll,
|
| - ::switches::kDisableUnprefixedMediaSource,
|
| - ::switches::kDisableWebKitMediaSource,
|
| - ::switches::kDisableAcceleratedFixedRootBackground,
|
| - ::switches::kEnableAcceleratedFixedRootBackground,
|
| - ::switches::kEnableAcceleratedOverflowScroll,
|
| - ::switches::kEnableBeginFrameScheduling,
|
| - ::switches::kEnableCompositingForFixedPosition,
|
| - ::switches::kEnableDelegatedRenderer,
|
| - ::switches::kEnableEncryptedMedia,
|
| - ::switches::kEnableGestureTapHighlight,
|
| - ::switches::kDisableGestureTapHighlight,
|
| - ::switches::kDisableGpuSandbox,
|
| - ::switches::kEnableDeferredFilters,
|
| - ::switches::kEnableGpuRasterization,
|
| - ::switches::kEnableImplSidePainting,
|
| - ::switches::kEnableLogging,
|
| - ::switches::kEnableMapImage,
|
| - ::switches::kEnablePinch,
|
| - ::switches::kEnableRepaintAfterLayout,
|
| - ::switches::kEnableThreadedCompositing,
|
| - ::switches::kEnableTouchDragDrop,
|
| - ::switches::kEnableTouchEditing,
|
| - ::switches::kEnableUniversalAcceleratedOverflowScroll,
|
| - ::switches::kEnableViewport,
|
| - ::switches::kEnableViewportMeta,
|
| - ::switches::kMainFrameResizesAreOrientationChanges,
|
| - ::switches::kForceDeviceScaleFactor,
|
| - ::switches::kForceGpuRasterization,
|
| - ::switches::kGpuStartupDialog,
|
| - ::switches::kGpuSandboxAllowSysVShm,
|
| - ::switches::kGpuSandboxFailuresFatal,
|
| - ::switches::kMultiProfiles,
|
| - ::switches::kNoSandbox,
|
| - ::switches::kNumRasterThreads,
|
| - ::switches::kPpapiFlashArgs,
|
| - ::switches::kPpapiFlashPath,
|
| - ::switches::kPpapiFlashVersion,
|
| - ::switches::kPpapiInProcess,
|
| - ::switches::kRendererStartupDialog,
|
| - ::switches::kEnableShareGroupAsyncTextureUpload,
|
| - ::switches::kTabCaptureUpscaleQuality,
|
| - ::switches::kTabCaptureDownscaleQuality,
|
| + ::switches::kDisableAccelerated2dCanvas,
|
| + ::switches::kDisableAcceleratedOverflowScroll,
|
| + ::switches::kDisableAcceleratedVideoDecode,
|
| + ::switches::kDisableBrowserPluginCompositing,
|
| + ::switches::kDisableDelegatedRenderer,
|
| + ::switches::kDisableFiltersOverIPC,
|
| + ::switches::kDisableForceCompositingMode,
|
| + ::switches::kDisableGpuShaderDiskCache,
|
| + ::switches::kDisableGpuWatchdog,
|
| + ::switches::kDisableGpuCompositing,
|
| + ::switches::kDisableGpuRasterization,
|
| + ::switches::kDisableImplSidePainting,
|
| + ::switches::kDisableLowResTiling,
|
| + ::switches::kDisableMapImage,
|
| + ::switches::kDisablePrefixedEncryptedMedia,
|
| + ::switches::kDisablePanelFitting,
|
| + ::switches::kDisableRepaintAfterLayout,
|
| + ::switches::kDisableSeccompFilterSandbox,
|
| + ::switches::kDisableSetuidSandbox,
|
| + ::switches::kDisableThreadedCompositing,
|
| + ::switches::kDisableTouchDragDrop,
|
| + ::switches::kDisableTouchEditing,
|
| + ::switches::kDisableUniversalAcceleratedOverflowScroll,
|
| + ::switches::kDisableUnprefixedMediaSource,
|
| + ::switches::kDisableWebKitMediaSource,
|
| + ::switches::kDisableAcceleratedFixedRootBackground,
|
| + ::switches::kEnableAcceleratedFixedRootBackground,
|
| + ::switches::kEnableAcceleratedOverflowScroll,
|
| + ::switches::kEnableBeginFrameScheduling,
|
| + ::switches::kEnableCompositingForFixedPosition,
|
| + ::switches::kEnableDelegatedRenderer,
|
| + ::switches::kEnableEncryptedMedia,
|
| + ::switches::kEnableGestureTapHighlight,
|
| + ::switches::kDisableGestureTapHighlight,
|
| + ::switches::kDisableGpuSandbox,
|
| + ::switches::kEnableDeferredFilters,
|
| + ::switches::kEnableGpuRasterization,
|
| + ::switches::kEnableImplSidePainting,
|
| + ::switches::kEnableLogging,
|
| + ::switches::kEnableLowResTiling,
|
| + ::switches::kEnableMapImage,
|
| + ::switches::kEnablePinch,
|
| + ::switches::kEnableRepaintAfterLayout,
|
| + ::switches::kEnableThreadedCompositing,
|
| + ::switches::kEnableTouchDragDrop,
|
| + ::switches::kEnableTouchEditing,
|
| + ::switches::kEnableUniversalAcceleratedOverflowScroll,
|
| + ::switches::kEnableViewport,
|
| + ::switches::kEnableViewportMeta,
|
| + ::switches::kMainFrameResizesAreOrientationChanges,
|
| + ::switches::kForceDeviceScaleFactor,
|
| + ::switches::kForceGpuRasterization,
|
| + ::switches::kGpuStartupDialog,
|
| + ::switches::kGpuSandboxAllowSysVShm,
|
| + ::switches::kGpuSandboxFailuresFatal,
|
| + ::switches::kMultiProfiles,
|
| + ::switches::kNoSandbox,
|
| + ::switches::kNumRasterThreads,
|
| + ::switches::kPpapiFlashArgs,
|
| + ::switches::kPpapiFlashPath,
|
| + ::switches::kPpapiFlashVersion,
|
| + ::switches::kPpapiInProcess,
|
| + ::switches::kRendererStartupDialog,
|
| + ::switches::kEnableShareGroupAsyncTextureUpload,
|
| + ::switches::kTabCaptureUpscaleQuality,
|
| + ::switches::kTabCaptureDownscaleQuality,
|
| #if defined(USE_XI2_MT)
|
| - ::switches::kTouchCalibration,
|
| + ::switches::kTouchCalibration,
|
| #endif
|
| - ::switches::kTouchDevices,
|
| - ::switches::kTouchEvents,
|
| - ::switches::kTouchOptimizedUI,
|
| - ::switches::kUIDisableThreadedCompositing,
|
| - ::switches::kUIPrioritizeInGpuProcess,
|
| + ::switches::kTouchDevices,
|
| + ::switches::kTouchEvents,
|
| + ::switches::kTouchOptimizedUI,
|
| + ::switches::kUIDisableThreadedCompositing,
|
| + ::switches::kUIPrioritizeInGpuProcess,
|
| #if defined(USE_CRAS)
|
| - ::switches::kUseCras,
|
| + ::switches::kUseCras,
|
| #endif
|
| - ::switches::kUseDiscardableMemory,
|
| - ::switches::kUseGL,
|
| - ::switches::kUserDataDir,
|
| - ::switches::kV,
|
| - ::switches::kVModule,
|
| - ::switches::kWebGLCommandBufferSizeKb,
|
| - ::switches::kEnableWebGLDraftExtensions,
|
| + ::switches::kUseDiscardableMemory,
|
| + ::switches::kUseGL,
|
| + ::switches::kUserDataDir,
|
| + ::switches::kV,
|
| + ::switches::kVModule,
|
| + ::switches::kWebGLCommandBufferSizeKb,
|
| + ::switches::kEnableWebGLDraftExtensions,
|
| #if defined(ENABLE_WEBRTC)
|
| - ::switches::kDisableWebRtcHWDecoding,
|
| - ::switches::kDisableWebRtcHWEncoding,
|
| - ::switches::kEnableAudioTrackProcessing,
|
| - ::switches::kEnableWebRtcHWVp8Encoding,
|
| + ::switches::kDisableWebRtcHWDecoding,
|
| + ::switches::kDisableWebRtcHWEncoding,
|
| + ::switches::kEnableAudioTrackProcessing,
|
| + ::switches::kEnableWebRtcHWVp8Encoding,
|
| #endif
|
| - ash::switches::kAshDefaultWallpaperLarge,
|
| - ash::switches::kAshDefaultWallpaperSmall,
|
| - ash::switches::kAshGuestWallpaperLarge,
|
| - ash::switches::kAshGuestWallpaperSmall,
|
| - ash::switches::kAshHostWindowBounds,
|
| - ash::switches::kAshTouchHud,
|
| - ash::switches::kAuraLegacyPowerButton,
|
| - // Please keep these in alphabetical order. Non-UI Compositor switches
|
| - // here should also be added to
|
| - // content/browser/renderer_host/render_process_host_impl.cc.
|
| - cc::switches::kCompositeToMailbox,
|
| - cc::switches::kDisableCompositedAntialiasing,
|
| - cc::switches::kDisableCompositorTouchHitTesting,
|
| - cc::switches::kDisableMainFrameBeforeActivation,
|
| - cc::switches::kDisableMainFrameBeforeDraw,
|
| - cc::switches::kDisableThreadedAnimation,
|
| - cc::switches::kEnableGpuBenchmarking,
|
| - cc::switches::kEnablePinchVirtualViewport,
|
| - cc::switches::kEnableMainFrameBeforeActivation,
|
| - cc::switches::kEnableTopControlsPositionCalculation,
|
| - cc::switches::kMaxTilesForInterestArea,
|
| - cc::switches::kMaxUnusedResourceMemoryUsagePercentage,
|
| - cc::switches::kShowCompositedLayerBorders,
|
| - cc::switches::kShowFPSCounter,
|
| - cc::switches::kShowLayerAnimationBounds,
|
| - cc::switches::kShowNonOccludingRects,
|
| - cc::switches::kShowOccludingRects,
|
| - cc::switches::kShowPropertyChangedRects,
|
| - cc::switches::kShowReplicaScreenSpaceRects,
|
| - cc::switches::kShowScreenSpaceRects,
|
| - cc::switches::kShowSurfaceDamageRects,
|
| - cc::switches::kSlowDownRasterScaleFactor,
|
| - cc::switches::kUIDisablePartialSwap,
|
| - chromeos::switches::kDbusStub,
|
| - chromeos::switches::kDisableLoginAnimations,
|
| - chromeos::switches::kHasChromeOSDiamondKey,
|
| - chromeos::switches::kHasChromeOSKeyboard,
|
| - chromeos::switches::kLoginProfile,
|
| - chromeos::switches::kNaturalScrollDefault,
|
| - ::switches::kEnableBrowserTextSubpixelPositioning,
|
| - ::switches::kEnableWebkitTextSubpixelPositioning,
|
| - policy::switches::kDeviceManagementUrl,
|
| - wm::switches::kWindowAnimationsDisabled,
|
| + ash::switches::kAshDefaultWallpaperLarge,
|
| + ash::switches::kAshDefaultWallpaperSmall,
|
| + ash::switches::kAshGuestWallpaperLarge,
|
| + ash::switches::kAshGuestWallpaperSmall,
|
| + ash::switches::kAshHostWindowBounds,
|
| + ash::switches::kAshTouchHud,
|
| + ash::switches::kAuraLegacyPowerButton,
|
| + // Please keep these in alphabetical order. Non-UI Compositor switches
|
| + // here should also be added to
|
| + // content/browser/renderer_host/render_process_host_impl.cc.
|
| + cc::switches::kCompositeToMailbox,
|
| + cc::switches::kDisableCompositedAntialiasing,
|
| + cc::switches::kDisableCompositorTouchHitTesting,
|
| + cc::switches::kDisableMainFrameBeforeActivation,
|
| + cc::switches::kDisableMainFrameBeforeDraw,
|
| + cc::switches::kDisableThreadedAnimation,
|
| + cc::switches::kEnableGpuBenchmarking,
|
| + cc::switches::kEnablePinchVirtualViewport,
|
| + cc::switches::kEnableMainFrameBeforeActivation,
|
| + cc::switches::kEnableTopControlsPositionCalculation,
|
| + cc::switches::kMaxTilesForInterestArea,
|
| + cc::switches::kMaxUnusedResourceMemoryUsagePercentage,
|
| + cc::switches::kShowCompositedLayerBorders,
|
| + cc::switches::kShowFPSCounter,
|
| + cc::switches::kShowLayerAnimationBounds,
|
| + cc::switches::kShowNonOccludingRects,
|
| + cc::switches::kShowOccludingRects,
|
| + cc::switches::kShowPropertyChangedRects,
|
| + cc::switches::kShowReplicaScreenSpaceRects,
|
| + cc::switches::kShowScreenSpaceRects,
|
| + cc::switches::kShowSurfaceDamageRects,
|
| + cc::switches::kSlowDownRasterScaleFactor,
|
| + cc::switches::kUIDisablePartialSwap,
|
| + chromeos::switches::kDbusStub,
|
| + chromeos::switches::kDisableLoginAnimations,
|
| + chromeos::switches::kHasChromeOSDiamondKey,
|
| + chromeos::switches::kHasChromeOSKeyboard,
|
| + chromeos::switches::kLoginProfile,
|
| + chromeos::switches::kNaturalScrollDefault,
|
| + ::switches::kEnableBrowserTextSubpixelPositioning,
|
| + ::switches::kEnableWebkitTextSubpixelPositioning,
|
| + policy::switches::kDeviceManagementUrl,
|
| + wm::switches::kWindowAnimationsDisabled,
|
| };
|
| command_line->CopySwitchesFrom(base_command_line,
|
| kForwardSwitches,
|
|
|