Index: Source/core/inspector/InspectorPageAgent.h |
diff --git a/Source/core/inspector/InspectorPageAgent.h b/Source/core/inspector/InspectorPageAgent.h |
index 3ee7092d54a7adc0f99f5c3ffadc3fd5229a2e13..2354061ee4d7287fcf3de5ac59374815f1005a02 100644 |
--- a/Source/core/inspector/InspectorPageAgent.h |
+++ b/Source/core/inspector/InspectorPageAgent.h |
@@ -63,7 +63,7 @@ class TextResourceDecoder; |
typedef String ErrorString; |
-class InspectorPageAgent FINAL : public InspectorBaseAgent<InspectorPageAgent>, public InspectorBackendDispatcher::PageCommandHandler { |
+class InspectorPageAgent final : public InspectorBaseAgent<InspectorPageAgent>, public InspectorBackendDispatcher::PageCommandHandler { |
WTF_MAKE_NONCOPYABLE(InspectorPageAgent); |
public: |
enum ResourceType { |
@@ -98,34 +98,34 @@ public: |
static PassOwnPtr<TextResourceDecoder> createResourceTextDecoder(const String& mimeType, const String& textEncodingName); |
// Page API for InspectorFrontend |
- virtual void enable(ErrorString*) OVERRIDE; |
- virtual void disable(ErrorString*) OVERRIDE; |
- virtual void addScriptToEvaluateOnLoad(ErrorString*, const String& source, String* result) OVERRIDE; |
- virtual void removeScriptToEvaluateOnLoad(ErrorString*, const String& identifier) OVERRIDE; |
- virtual void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad, const String* optionalScriptPreprocessor) OVERRIDE; |
- virtual void navigate(ErrorString*, const String& url, String* frameId) OVERRIDE; |
- virtual void getCookies(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie> >& cookies) OVERRIDE; |
- virtual void deleteCookie(ErrorString*, const String& cookieName, const String& url) OVERRIDE; |
- virtual void getResourceTree(ErrorString*, RefPtr<TypeBuilder::Page::FrameResourceTree>&) OVERRIDE; |
- virtual void getResourceContent(ErrorString*, const String& frameId, const String& url, PassRefPtrWillBeRawPtr<GetResourceContentCallback>) OVERRIDE; |
- virtual void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch> >&) OVERRIDE; |
- virtual void setDocumentContent(ErrorString*, const String& frameId, const String& html) OVERRIDE; |
- virtual void setDeviceMetricsOverride(ErrorString*, int width, int height, double deviceScaleFactor, bool mobile, bool fitWindow, const double* optionalScale, const double* optionalOffsetX, const double* optionalOffsetY) OVERRIDE; |
- virtual void clearDeviceMetricsOverride(ErrorString*) OVERRIDE; |
- virtual void resetScrollAndPageScaleFactor(ErrorString*) OVERRIDE; |
- virtual void setPageScaleFactor(ErrorString*, double pageScaleFactor) OVERRIDE; |
- virtual void setShowPaintRects(ErrorString*, bool show) OVERRIDE; |
- virtual void setShowDebugBorders(ErrorString*, bool show) OVERRIDE; |
- virtual void setShowFPSCounter(ErrorString*, bool show) OVERRIDE; |
- virtual void setContinuousPaintingEnabled(ErrorString*, bool enabled) OVERRIDE; |
- virtual void setShowScrollBottleneckRects(ErrorString*, bool show) OVERRIDE; |
- virtual void getScriptExecutionStatus(ErrorString*, PageCommandHandler::Result::Enum*) OVERRIDE; |
- virtual void setScriptExecutionDisabled(ErrorString*, bool) OVERRIDE; |
- virtual void setTouchEmulationEnabled(ErrorString*, bool) OVERRIDE; |
- virtual void setEmulatedMedia(ErrorString*, const String&) OVERRIDE; |
- virtual void startScreencast(ErrorString*, const String* format, const int* quality, const int* maxWidth, const int* maxHeight) OVERRIDE; |
- virtual void stopScreencast(ErrorString*) OVERRIDE; |
- virtual void setShowViewportSizeOnResize(ErrorString*, bool show, const bool* showGrid) OVERRIDE; |
+ virtual void enable(ErrorString*) override; |
+ virtual void disable(ErrorString*) override; |
+ virtual void addScriptToEvaluateOnLoad(ErrorString*, const String& source, String* result) override; |
+ virtual void removeScriptToEvaluateOnLoad(ErrorString*, const String& identifier) override; |
+ virtual void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad, const String* optionalScriptPreprocessor) override; |
+ virtual void navigate(ErrorString*, const String& url, String* frameId) override; |
+ virtual void getCookies(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Page::Cookie> >& cookies) override; |
+ virtual void deleteCookie(ErrorString*, const String& cookieName, const String& url) override; |
+ virtual void getResourceTree(ErrorString*, RefPtr<TypeBuilder::Page::FrameResourceTree>&) override; |
+ virtual void getResourceContent(ErrorString*, const String& frameId, const String& url, PassRefPtrWillBeRawPtr<GetResourceContentCallback>) override; |
+ virtual void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch> >&) override; |
+ virtual void setDocumentContent(ErrorString*, const String& frameId, const String& html) override; |
+ virtual void setDeviceMetricsOverride(ErrorString*, int width, int height, double deviceScaleFactor, bool mobile, bool fitWindow, const double* optionalScale, const double* optionalOffsetX, const double* optionalOffsetY) override; |
+ virtual void clearDeviceMetricsOverride(ErrorString*) override; |
+ virtual void resetScrollAndPageScaleFactor(ErrorString*) override; |
+ virtual void setPageScaleFactor(ErrorString*, double pageScaleFactor) override; |
+ virtual void setShowPaintRects(ErrorString*, bool show) override; |
+ virtual void setShowDebugBorders(ErrorString*, bool show) override; |
+ virtual void setShowFPSCounter(ErrorString*, bool show) override; |
+ virtual void setContinuousPaintingEnabled(ErrorString*, bool enabled) override; |
+ virtual void setShowScrollBottleneckRects(ErrorString*, bool show) override; |
+ virtual void getScriptExecutionStatus(ErrorString*, PageCommandHandler::Result::Enum*) override; |
+ virtual void setScriptExecutionDisabled(ErrorString*, bool) override; |
+ virtual void setTouchEmulationEnabled(ErrorString*, bool) override; |
+ virtual void setEmulatedMedia(ErrorString*, const String&) override; |
+ virtual void startScreencast(ErrorString*, const String* format, const int* quality, const int* maxWidth, const int* maxHeight) override; |
+ virtual void stopScreencast(ErrorString*) override; |
+ virtual void setShowViewportSizeOnResize(ErrorString*, bool show, const bool* showGrid) override; |
// InspectorInstrumentation API |
void didClearDocumentOfWindowObject(LocalFrame*); |
@@ -151,10 +151,10 @@ public: |
void scriptsEnabled(bool isEnabled); |
// Inspector Controller API |
- virtual void setFrontend(InspectorFrontend*) OVERRIDE; |
- virtual void clearFrontend() OVERRIDE; |
- virtual void restore() OVERRIDE; |
- virtual void discardAgent() OVERRIDE; |
+ virtual void setFrontend(InspectorFrontend*) override; |
+ virtual void clearFrontend() override; |
+ virtual void restore() override; |
+ virtual void discardAgent() override; |
// Cross-agents API |
Page* page() { return m_page; } |
@@ -177,7 +177,7 @@ public: |
void addEditedResourceContent(const String& url, const String& content); |
bool getEditedResourceContent(const String& url, String* content); |
- virtual void trace(Visitor*) OVERRIDE; |
+ virtual void trace(Visitor*) override; |
private: |
class GetResourceContentLoadListener; |