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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/web/WebSettingsImpl.h

Issue 634893002: Replace OVERRIDE and FINAL with override and final in WebKit/public (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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.cpp ('k') | Source/web/WebSharedWorkerImpl.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 2ea737dcaf573df6f8c14fca46523cd2935cf254..223ff738f0e420b50afa57649b8fb16aeda4e474 100644
--- a/Source/web/WebSettingsImpl.h
+++ b/Source/web/WebSettingsImpl.h
@@ -38,145 +38,145 @@ namespace blink {
class InspectorController;
class Settings;
-class WebSettingsImpl FINAL : public WebSettings {
+class WebSettingsImpl final : public WebSettings {
public:
explicit WebSettingsImpl(Settings*, InspectorController*);
virtual ~WebSettingsImpl() { }
- 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 setAllowDisplayOfInsecureContent(bool) OVERRIDE;
- virtual void setAllowFileAccessFromFileURLs(bool) OVERRIDE;
- virtual void setAllowCustomScrollbarInMainFrame(bool) OVERRIDE;
- virtual void setAllowRunningOfInsecureContent(bool) OVERRIDE;
- virtual void setAllowConnectingInsecureWebSocket(bool) OVERRIDE;
- virtual void setAllowScriptsToCloseWindows(bool) OVERRIDE;
- virtual void setAllowUniversalAccessFromFileURLs(bool) OVERRIDE;
- virtual void setAntialiased2dCanvasEnabled(bool) OVERRIDE;
- virtual void setAsynchronousSpellCheckingEnabled(bool) OVERRIDE;
- virtual void setAutoZoomFocusedNodeToLegibleScale(bool) OVERRIDE;
- virtual void setCaretBrowsingEnabled(bool) OVERRIDE;
- virtual void setClobberUserAgentInitialScaleQuirk(bool) OVERRIDE;
- virtual void setContainerCullingEnabled(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 setDeferredFiltersEnabled(bool) OVERRIDE;
- virtual void setDeferredImageDecodingEnabled(bool) OVERRIDE;
- virtual void setDeviceScaleAdjustment(float) OVERRIDE;
- virtual void setDeviceSupportsMouse(bool) 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 setAllowDisplayOfInsecureContent(bool) override;
+ virtual void setAllowFileAccessFromFileURLs(bool) override;
+ virtual void setAllowCustomScrollbarInMainFrame(bool) override;
+ virtual void setAllowRunningOfInsecureContent(bool) override;
+ virtual void setAllowConnectingInsecureWebSocket(bool) override;
+ virtual void setAllowScriptsToCloseWindows(bool) override;
+ virtual void setAllowUniversalAccessFromFileURLs(bool) override;
+ virtual void setAntialiased2dCanvasEnabled(bool) override;
+ virtual void setAsynchronousSpellCheckingEnabled(bool) override;
+ virtual void setAutoZoomFocusedNodeToLegibleScale(bool) override;
+ virtual void setCaretBrowsingEnabled(bool) override;
+ virtual void setClobberUserAgentInitialScaleQuirk(bool) override;
+ virtual void setContainerCullingEnabled(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 setDeferredFiltersEnabled(bool) override;
+ virtual void setDeferredImageDecodingEnabled(bool) override;
+ virtual void setDeviceScaleAdjustment(float) override;
+ virtual void setDeviceSupportsMouse(bool) override;
// FIXME: Remove once the pointer/hover features are converted to use the
// new APIs (e.g. setPrimaryPointerType) on the chromium side
- virtual void setDeviceSupportsTouch(bool) OVERRIDE;
+ virtual void setDeviceSupportsTouch(bool) override;
- virtual void setDisallowFullscreenForNonMediaElements(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 void setRegionBasedColumnsEnabled(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 setForceZeroLayoutHeight(bool) OVERRIDE;
- virtual void setFullscreenSupported(bool) OVERRIDE;
- virtual void setHyperlinkAuditingEnabled(bool) OVERRIDE;
- virtual void setIgnoreMainFrameOverflowHiddenQuirk(bool) OVERRIDE;
- virtual void setImagesEnabled(bool) OVERRIDE;
- virtual void setInlineTextBoxAccessibilityEnabled(bool) OVERRIDE;
- virtual void setJavaEnabled(bool) OVERRIDE;
- virtual void setJavaScriptCanAccessClipboard(bool) OVERRIDE;
- virtual void setJavaScriptCanOpenWindowsAutomatically(bool) OVERRIDE;
- virtual void setJavaScriptEnabled(bool) OVERRIDE;
- virtual void setLayerSquashingEnabled(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 setPinchVirtualViewportEnabled(bool) 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 setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE;
- virtual void setSelectTrailingWhitespaceEnabled(bool OVERRIDE);
- virtual void setSelectionIncludesAltImageText(bool) 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 setShowFPSCounter(bool) OVERRIDE;
- virtual void setShowPaintRects(bool) OVERRIDE;
- virtual void setShrinksStandaloneImagesToFit(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 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;
- 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 setUseSolidColorScrollbars(bool) OVERRIDE;
- virtual void setUseWideViewport(bool) OVERRIDE;
- virtual void setV8CacheOptions(V8CacheOptions) OVERRIDE;
- virtual void setV8ScriptStreamingEnabled(bool) 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;
+ virtual void setDisallowFullscreenForNonMediaElements(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 void setRegionBasedColumnsEnabled(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 setForceZeroLayoutHeight(bool) override;
+ virtual void setFullscreenSupported(bool) override;
+ virtual void setHyperlinkAuditingEnabled(bool) override;
+ virtual void setIgnoreMainFrameOverflowHiddenQuirk(bool) override;
+ virtual void setImagesEnabled(bool) override;
+ virtual void setInlineTextBoxAccessibilityEnabled(bool) override;
+ virtual void setJavaEnabled(bool) override;
+ virtual void setJavaScriptCanAccessClipboard(bool) override;
+ virtual void setJavaScriptCanOpenWindowsAutomatically(bool) override;
+ virtual void setJavaScriptEnabled(bool) override;
+ virtual void setLayerSquashingEnabled(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 setPinchVirtualViewportEnabled(bool) 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 setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) override;
+ virtual void setSelectTrailingWhitespaceEnabled(bool override);
+ virtual void setSelectionIncludesAltImageText(bool) 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 setShowFPSCounter(bool) override;
+ virtual void setShowPaintRects(bool) override;
+ virtual void setShrinksStandaloneImagesToFit(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 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;
+ 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 setUseSolidColorScrollbars(bool) override;
+ virtual void setUseWideViewport(bool) override;
+ virtual void setV8CacheOptions(V8CacheOptions) override;
+ virtual void setV8ScriptStreamingEnabled(bool) 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;
bool showFPSCounter() const { return m_showFPSCounter; }
bool showPaintRects() const { return m_showPaintRects; }
« no previous file with comments | « Source/web/WebRemoteFrameImpl.cpp ('k') | Source/web/WebSharedWorkerImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698