| Index: content/browser/frame_host/render_frame_host_impl.h
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
|
| index a848238ef6e77643bdb75c0b590355b7de1276a0..028fb2828bb9ce6730605a84b9137e6f25c00d8e 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.h
|
| +++ b/content/browser/frame_host/render_frame_host_impl.h
|
| @@ -93,52 +93,52 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
| virtual ~RenderFrameHostImpl();
|
|
|
| // RenderFrameHost
|
| - virtual int GetRoutingID() OVERRIDE;
|
| - virtual SiteInstanceImpl* GetSiteInstance() OVERRIDE;
|
| - virtual RenderProcessHost* GetProcess() OVERRIDE;
|
| - virtual RenderFrameHost* GetParent() OVERRIDE;
|
| - virtual const std::string& GetFrameName() OVERRIDE;
|
| - virtual bool IsCrossProcessSubframe() OVERRIDE;
|
| - virtual GURL GetLastCommittedURL() OVERRIDE;
|
| - virtual gfx::NativeView GetNativeView() OVERRIDE;
|
| + virtual int GetRoutingID() override;
|
| + virtual SiteInstanceImpl* GetSiteInstance() override;
|
| + virtual RenderProcessHost* GetProcess() override;
|
| + virtual RenderFrameHost* GetParent() override;
|
| + virtual const std::string& GetFrameName() override;
|
| + virtual bool IsCrossProcessSubframe() override;
|
| + virtual GURL GetLastCommittedURL() override;
|
| + virtual gfx::NativeView GetNativeView() override;
|
| virtual void ExecuteJavaScript(
|
| - const base::string16& javascript) OVERRIDE;
|
| + const base::string16& javascript) override;
|
| virtual void ExecuteJavaScript(
|
| const base::string16& javascript,
|
| - const JavaScriptResultCallback& callback) OVERRIDE;
|
| + const JavaScriptResultCallback& callback) override;
|
| virtual void ExecuteJavaScriptForTests(
|
| - const base::string16& javascript) OVERRIDE;
|
| - virtual RenderViewHost* GetRenderViewHost() OVERRIDE;
|
| - virtual ServiceRegistry* GetServiceRegistry() OVERRIDE;
|
| + const base::string16& javascript) override;
|
| + virtual RenderViewHost* GetRenderViewHost() override;
|
| + virtual ServiceRegistry* GetServiceRegistry() override;
|
|
|
| // IPC::Sender
|
| - virtual bool Send(IPC::Message* msg) OVERRIDE;
|
| + virtual bool Send(IPC::Message* msg) override;
|
|
|
| // IPC::Listener
|
| - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
|
| + virtual bool OnMessageReceived(const IPC::Message& msg) override;
|
|
|
| // BrowserAccessibilityDelegate
|
| - virtual void AccessibilitySetFocus(int acc_obj_id) OVERRIDE;
|
| - virtual void AccessibilityDoDefaultAction(int acc_obj_id) OVERRIDE;
|
| - virtual void AccessibilityShowMenu(const gfx::Point& global_point) OVERRIDE;
|
| + virtual void AccessibilitySetFocus(int acc_obj_id) override;
|
| + virtual void AccessibilityDoDefaultAction(int acc_obj_id) override;
|
| + virtual void AccessibilityShowMenu(const gfx::Point& global_point) override;
|
| virtual void AccessibilityScrollToMakeVisible(
|
| - int acc_obj_id, const gfx::Rect& subfocus) OVERRIDE;
|
| + int acc_obj_id, const gfx::Rect& subfocus) override;
|
| virtual void AccessibilityScrollToPoint(
|
| - int acc_obj_id, const gfx::Point& point) OVERRIDE;
|
| + int acc_obj_id, const gfx::Point& point) override;
|
| virtual void AccessibilitySetTextSelection(
|
| - int acc_obj_id, int start_offset, int end_offset) OVERRIDE;
|
| - virtual bool AccessibilityViewHasFocus() const OVERRIDE;
|
| - virtual gfx::Rect AccessibilityGetViewBounds() const OVERRIDE;
|
| + int acc_obj_id, int start_offset, int end_offset) override;
|
| + virtual bool AccessibilityViewHasFocus() const override;
|
| + virtual gfx::Rect AccessibilityGetViewBounds() const override;
|
| virtual gfx::Point AccessibilityOriginInScreen(const gfx::Rect& bounds)
|
| - const OVERRIDE;
|
| - virtual void AccessibilityHitTest(const gfx::Point& point) OVERRIDE;
|
| - virtual void AccessibilityFatalError() OVERRIDE;
|
| - virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() OVERRIDE;
|
| + const override;
|
| + virtual void AccessibilityHitTest(const gfx::Point& point) override;
|
| + virtual void AccessibilityFatalError() override;
|
| + virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override;
|
| virtual gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible()
|
| - OVERRIDE;
|
| + override;
|
| virtual BrowserAccessibilityManager* AccessibilityGetChildFrame(
|
| - int accessibility_node_id) OVERRIDE;
|
| - virtual BrowserAccessibility* AccessibilityGetParentFrame() OVERRIDE;
|
| + int accessibility_node_id) override;
|
| + virtual BrowserAccessibility* AccessibilityGetParentFrame() override;
|
|
|
| // Creates a RenderFrame in the renderer process. Only called for
|
| // cross-process subframe navigations in --site-per-process.
|
|
|