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

Unified Diff: Source/web/WebSettingsImpl.h

Issue 1230533002: Fix virtual/override/final usage in Source/web/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/WebRemoteFrameImpl.h ('k') | Source/web/WebSocketChannelClientProxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebSettingsImpl.h
diff --git a/Source/web/WebSettingsImpl.h b/Source/web/WebSettingsImpl.h
index 771072a2d508e3783da466c3891e55350ff7859b..f80efe0be57da9f9fd5caf5538ad38f2e2e928d1 100644
--- a/Source/web/WebSettingsImpl.h
+++ b/Source/web/WebSettingsImpl.h
@@ -43,123 +43,123 @@ public:
WebSettingsImpl(Settings*, DevToolsEmulator*);
virtual ~WebSettingsImpl() { }
- virtual void setFromStrings(const WebString& name, const WebString& value) override;
+ void setFromStrings(const WebString& name, const WebString& value) override;
- virtual bool mainFrameResizesAreOrientationChanges() const override;
- virtual bool shrinksViewportContentToFit() const override;
- virtual int availablePointerTypes() const override;
- virtual PointerType primaryPointerType() const override;
- virtual int availableHoverTypes() const override;
- virtual HoverType primaryHoverType() const override;
- virtual bool viewportEnabled() const override;
- virtual void setAccelerated2dCanvasEnabled(bool) override;
- virtual void setAccelerated2dCanvasMSAASampleCount(int) override;
- virtual void setAcceleratedCompositingEnabled(bool) override;
- virtual void setPreferCompositingToLCDTextEnabled(bool) override;
- virtual void setAccessibilityEnabled(bool) override;
- virtual void setAccessibilityPasswordValuesEnabled(bool) override;
- virtual void setAllowDisplayOfInsecureContent(bool) override;
- virtual void setAllowFileAccessFromFileURLs(bool) override;
- virtual void setAllowCustomScrollbarInMainFrame(bool) override;
- virtual void setAllowRunningOfInsecureContent(bool) override;
- virtual void setAllowScriptsToCloseWindows(bool) override;
- virtual void setAllowUniversalAccessFromFileURLs(bool) override;
- virtual void setAntialiased2dCanvasEnabled(bool) override;
- virtual void setAntialiasedClips2dCanvasEnabled(bool) override;
- virtual void setAsynchronousSpellCheckingEnabled(bool) override;
- virtual void setAutoZoomFocusedNodeToLegibleScale(bool) override;
- virtual void setCaretBrowsingEnabled(bool) override;
- virtual void setClobberUserAgentInitialScaleQuirk(bool) override;
- virtual void setCookieEnabled(bool) override;
- virtual void setNavigateOnDragDrop(bool) override;
- virtual void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
- virtual void setDNSPrefetchingEnabled(bool) override;
- virtual void setDOMPasteAllowed(bool) override;
- virtual void setDefaultFixedFontSize(int) override;
- virtual void setDefaultFontSize(int) override;
- virtual void setDefaultTextEncodingName(const WebString&) override;
- virtual void setDefaultVideoPosterURL(const WebString&) override;
- virtual void setDeviceScaleAdjustment(float) override;
+ bool mainFrameResizesAreOrientationChanges() const override;
+ bool shrinksViewportContentToFit() const override;
+ int availablePointerTypes() const override;
+ PointerType primaryPointerType() const override;
+ int availableHoverTypes() const override;
+ HoverType primaryHoverType() const override;
+ bool viewportEnabled() const override;
+ void setAccelerated2dCanvasEnabled(bool) override;
+ void setAccelerated2dCanvasMSAASampleCount(int) override;
+ void setAcceleratedCompositingEnabled(bool) override;
+ void setPreferCompositingToLCDTextEnabled(bool) override;
+ void setAccessibilityEnabled(bool) override;
+ void setAccessibilityPasswordValuesEnabled(bool) override;
+ void setAllowDisplayOfInsecureContent(bool) override;
+ void setAllowFileAccessFromFileURLs(bool) override;
+ void setAllowCustomScrollbarInMainFrame(bool) override;
+ void setAllowRunningOfInsecureContent(bool) override;
+ void setAllowScriptsToCloseWindows(bool) override;
+ void setAllowUniversalAccessFromFileURLs(bool) override;
+ void setAntialiased2dCanvasEnabled(bool) override;
+ void setAntialiasedClips2dCanvasEnabled(bool) override;
+ void setAsynchronousSpellCheckingEnabled(bool) override;
+ void setAutoZoomFocusedNodeToLegibleScale(bool) override;
+ void setCaretBrowsingEnabled(bool) override;
+ void setClobberUserAgentInitialScaleQuirk(bool) override;
+ void setCookieEnabled(bool) override;
+ void setNavigateOnDragDrop(bool) override;
+ void setCursiveFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ void setDNSPrefetchingEnabled(bool) override;
+ void setDOMPasteAllowed(bool) override;
+ void setDefaultFixedFontSize(int) override;
+ void setDefaultFontSize(int) override;
+ void setDefaultTextEncodingName(const WebString&) override;
+ void setDefaultVideoPosterURL(const WebString&) override;
+ void setDeviceScaleAdjustment(float) override;
// FIXME: Replace these two with pointer/hover queries? crbug.com/441813
- virtual void setDeviceSupportsMouse(bool) override;
- virtual void setDeviceSupportsTouch(bool) override;
+ void setDeviceSupportsMouse(bool) override;
+ void setDeviceSupportsTouch(bool) override;
- virtual void setDisableReadingFromCanvas(bool) override;
- virtual void setDoubleTapToZoomEnabled(bool) override;
- virtual void setDownloadableBinaryFontsEnabled(bool) override;
- virtual void setEditingBehavior(EditingBehavior) override;
- virtual void setEnableScrollAnimator(bool) override;
- virtual void setEnableTouchAdjustment(bool) override;
- virtual bool multiTargetTapNotificationEnabled() override;
- virtual void setMultiTargetTapNotificationEnabled(bool) override;
- virtual void setExperimentalWebGLEnabled(bool) override;
- virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
- virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
- virtual void setReportWheelOverscroll(bool) override;
- virtual void setForceZeroLayoutHeight(bool) override;
- virtual void setFullscreenSupported(bool) override;
- virtual void setHyperlinkAuditingEnabled(bool) override;
- virtual void setIgnoreMainFrameOverflowHiddenQuirk(bool) override;
- virtual void setImageAnimationPolicy(ImageAnimationPolicy) override;
- virtual void setImagesEnabled(bool) override;
- virtual void setInlineTextBoxAccessibilityEnabled(bool) override;
- virtual void setInvertViewportScrollOrder(bool) override;
- virtual void setJavaEnabled(bool) override;
- virtual void setJavaScriptCanAccessClipboard(bool) override;
- virtual void setJavaScriptCanOpenWindowsAutomatically(bool) override;
- virtual void setJavaScriptEnabled(bool) override;
- virtual void setLoadsImagesAutomatically(bool) override;
- virtual void setLoadWithOverviewMode(bool) override;
- virtual void setLocalStorageEnabled(bool) override;
- virtual void setMainFrameClipsContent(bool) override;
- virtual void setMainFrameResizesAreOrientationChanges(bool) override;
- virtual void setMaxTouchPoints(int) override;
- virtual void setMediaControlsOverlayPlayButtonEnabled(bool) override;
- virtual void setMediaPlaybackRequiresUserGesture(bool) override;
- virtual void setMinimumAccelerated2dCanvasSize(int) override;
- virtual void setMinimumFontSize(int) override;
- virtual void setMinimumLogicalFontSize(int) override;
- virtual void setMockScrollbarsEnabled(bool) override;
- virtual void setOfflineWebApplicationCacheEnabled(bool) override;
- virtual void setOpenGLMultisamplingEnabled(bool) override;
- virtual void setPasswordEchoDurationInSeconds(double) override;
- virtual void setPasswordEchoEnabled(bool) override;
- virtual void setPerTilePaintingEnabled(bool) override;
- virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
- virtual void setPinchOverlayScrollbarThickness(int) override;
- virtual void setPluginsEnabled(bool) override;
- virtual void setAvailablePointerTypes(int) override;
- virtual void setPrimaryPointerType(PointerType) override;
- virtual void setAvailableHoverTypes(int) override;
- virtual void setPrimaryHoverType(HoverType) override;
- virtual void setRenderVSyncNotificationEnabled(bool) override;
- virtual void setReportScreenSizeInPhysicalPixelsQuirk(bool) override;
- virtual void setRootLayerScrolls(bool) override;
- virtual void setRubberBandingOnCompositorThread(bool) override;
- virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
- virtual void setSelectTrailingWhitespaceEnabled(bool override);
- virtual void setSelectionIncludesAltImageText(bool) override;
- virtual void setSelectionStrategy(SelectionStrategyType) override;
- virtual void setSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
- virtual void setShouldPrintBackgrounds(bool) override;
- virtual void setShouldClearDocumentBackground(bool) override;
- virtual void setShouldRespectImageOrientation(bool) override;
- virtual void setShowContextMenuOnMouseUp(bool) override;
- virtual void setShowFPSCounter(bool) override;
- virtual void setShowPaintRects(bool) override;
- virtual void setShrinksViewportContentToFit(bool) override;
- virtual void setSmartInsertDeleteEnabled(bool) override;
- virtual void setSpatialNavigationEnabled(bool) override;
- virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
- virtual void setStrictMixedContentChecking(bool) override;
- virtual void setStrictPowerfulFeatureRestrictions(bool) override;
- virtual void setSupportDeprecatedTargetDensityDPI(bool) override;
- virtual void setSupportsMultipleWindows(bool) override;
- virtual void setSyncXHRInDocumentsEnabled(bool) override;
- virtual void setTextAreasAreResizable(bool) override;
- virtual void setTextAutosizingEnabled(bool) override;
- virtual void setAccessibilityFontScaleFactor(float) override;
+ void setDisableReadingFromCanvas(bool) override;
+ void setDoubleTapToZoomEnabled(bool) override;
+ void setDownloadableBinaryFontsEnabled(bool) override;
+ void setEditingBehavior(EditingBehavior) override;
+ void setEnableScrollAnimator(bool) override;
+ void setEnableTouchAdjustment(bool) override;
+ bool multiTargetTapNotificationEnabled() override;
+ void setMultiTargetTapNotificationEnabled(bool) override;
+ void setExperimentalWebGLEnabled(bool) override;
+ void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ void setReportWheelOverscroll(bool) override;
+ void setForceZeroLayoutHeight(bool) override;
+ void setFullscreenSupported(bool) override;
+ void setHyperlinkAuditingEnabled(bool) override;
+ void setIgnoreMainFrameOverflowHiddenQuirk(bool) override;
+ void setImageAnimationPolicy(ImageAnimationPolicy) override;
+ void setImagesEnabled(bool) override;
+ void setInlineTextBoxAccessibilityEnabled(bool) override;
+ void setInvertViewportScrollOrder(bool) override;
+ void setJavaEnabled(bool) override;
+ void setJavaScriptCanAccessClipboard(bool) override;
+ void setJavaScriptCanOpenWindowsAutomatically(bool) override;
+ void setJavaScriptEnabled(bool) override;
+ void setLoadsImagesAutomatically(bool) override;
+ void setLoadWithOverviewMode(bool) override;
+ void setLocalStorageEnabled(bool) override;
+ void setMainFrameClipsContent(bool) override;
+ void setMainFrameResizesAreOrientationChanges(bool) override;
+ void setMaxTouchPoints(int) override;
+ void setMediaControlsOverlayPlayButtonEnabled(bool) override;
+ void setMediaPlaybackRequiresUserGesture(bool) override;
+ void setMinimumAccelerated2dCanvasSize(int) override;
+ void setMinimumFontSize(int) override;
+ void setMinimumLogicalFontSize(int) override;
+ void setMockScrollbarsEnabled(bool) override;
+ void setOfflineWebApplicationCacheEnabled(bool) override;
+ void setOpenGLMultisamplingEnabled(bool) override;
+ void setPasswordEchoDurationInSeconds(double) override;
+ void setPasswordEchoEnabled(bool) override;
+ void setPerTilePaintingEnabled(bool) override;
+ void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ void setPinchOverlayScrollbarThickness(int) override;
+ void setPluginsEnabled(bool) override;
+ void setAvailablePointerTypes(int) override;
+ void setPrimaryPointerType(PointerType) override;
+ void setAvailableHoverTypes(int) override;
+ void setPrimaryHoverType(HoverType) override;
+ void setRenderVSyncNotificationEnabled(bool) override;
+ void setReportScreenSizeInPhysicalPixelsQuirk(bool) override;
+ void setRootLayerScrolls(bool) override;
+ void setRubberBandingOnCompositorThread(bool) override;
+ void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ void setSelectTrailingWhitespaceEnabled(bool override);
+ void setSelectionIncludesAltImageText(bool) override;
+ void setSelectionStrategy(SelectionStrategyType) override;
+ void setSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ void setShouldPrintBackgrounds(bool) override;
+ void setShouldClearDocumentBackground(bool) override;
+ void setShouldRespectImageOrientation(bool) override;
+ void setShowContextMenuOnMouseUp(bool) override;
+ void setShowFPSCounter(bool) override;
+ void setShowPaintRects(bool) override;
+ void setShrinksViewportContentToFit(bool) override;
+ void setSmartInsertDeleteEnabled(bool) override;
+ void setSpatialNavigationEnabled(bool) override;
+ void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ void setStrictMixedContentChecking(bool) override;
+ void setStrictPowerfulFeatureRestrictions(bool) override;
+ void setSupportDeprecatedTargetDensityDPI(bool) override;
+ void setSupportsMultipleWindows(bool) override;
+ void setSyncXHRInDocumentsEnabled(bool) override;
+ void setTextAreasAreResizable(bool) override;
+ void setTextAutosizingEnabled(bool) override;
+ void setAccessibilityFontScaleFactor(float) override;
virtual void setTextTrackBackgroundColor(const WebString&);
virtual void setTextTrackFontFamily(const WebString&);
virtual void setTextTrackFontStyle(const WebString&);
@@ -167,29 +167,29 @@ public:
virtual void setTextTrackTextColor(const WebString&);
virtual void setTextTrackTextShadow(const WebString&);
virtual void setTextTrackTextSize(const WebString&);
- virtual void setThreadedScrollingEnabled(bool) override;
- virtual void setTouchDragDropEnabled(bool) override;
- virtual void setTouchEditingEnabled(bool) override;
- virtual void setUnifiedTextCheckerEnabled(bool) override;
- virtual void setUnsafePluginPastingEnabled(bool) override;
- virtual void setUsesEncodingDetector(bool) override;
- virtual void setUseLegacyBackgroundSizeShorthandBehavior(bool) override;
- virtual void setUseMobileViewportStyle(bool) override;
- virtual void setUseSolidColorScrollbars(bool) override;
- virtual void setUseWideViewport(bool) override;
- virtual void setV8CacheOptions(V8CacheOptions) override;
- virtual void setValidationMessageTimerMagnification(int) override;
- virtual void setViewportEnabled(bool) override;
- virtual void setViewportMetaEnabled(bool) override;
- virtual void setViewportMetaLayoutSizeQuirk(bool) override;
- virtual void setViewportMetaMergeContentQuirk(bool) override;
- virtual void setViewportMetaNonUserScalableQuirk(bool) override;
- virtual void setViewportMetaZeroValuesQuirk(bool) override;
- virtual void setWebAudioEnabled(bool) override;
- virtual void setWebGLErrorsToConsoleEnabled(bool) override;
- virtual void setWebSecurityEnabled(bool) override;
- virtual void setWideViewportQuirkEnabled(bool) override;
- virtual void setXSSAuditorEnabled(bool) override;
+ void setThreadedScrollingEnabled(bool) override;
+ void setTouchDragDropEnabled(bool) override;
+ void setTouchEditingEnabled(bool) override;
+ void setUnifiedTextCheckerEnabled(bool) override;
+ void setUnsafePluginPastingEnabled(bool) override;
+ void setUsesEncodingDetector(bool) override;
+ void setUseLegacyBackgroundSizeShorthandBehavior(bool) override;
+ void setUseMobileViewportStyle(bool) override;
+ void setUseSolidColorScrollbars(bool) override;
+ void setUseWideViewport(bool) override;
+ void setV8CacheOptions(V8CacheOptions) override;
+ void setValidationMessageTimerMagnification(int) override;
+ void setViewportEnabled(bool) override;
+ void setViewportMetaEnabled(bool) override;
+ void setViewportMetaLayoutSizeQuirk(bool) override;
+ void setViewportMetaMergeContentQuirk(bool) override;
+ void setViewportMetaNonUserScalableQuirk(bool) override;
+ void setViewportMetaZeroValuesQuirk(bool) override;
+ void setWebAudioEnabled(bool) override;
+ void setWebGLErrorsToConsoleEnabled(bool) override;
+ void setWebSecurityEnabled(bool) override;
+ void setWideViewportQuirkEnabled(bool) override;
+ void setXSSAuditorEnabled(bool) override;
bool showFPSCounter() const { return m_showFPSCounter; }
bool showPaintRects() const { return m_showPaintRects; }
« no previous file with comments | « Source/web/WebRemoteFrameImpl.h ('k') | Source/web/WebSocketChannelClientProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698