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

Unified Diff: content/test/test_web_contents.h

Issue 630813002: Replace OVERRIDE and FINAL with override and final in content/test/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 | « content/test/test_video_frame_provider.h ('k') | content/test/web_gesture_curve_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/test_web_contents.h
diff --git a/content/test/test_web_contents.h b/content/test/test_web_contents.h
index 8771af105bf0069fefce6b4906146e46ae6fba5e..5ddd706105aab151ea8528208e2ee7b6ea954cff 100644
--- a/content/test/test_web_contents.h
+++ b/content/test/test_web_contents.h
@@ -30,26 +30,26 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
SiteInstance* instance);
// WebContentsImpl overrides (returning the same values, but in Test* types)
- virtual TestRenderFrameHost* GetMainFrame() OVERRIDE;
- virtual TestRenderViewHost* GetRenderViewHost() const OVERRIDE;
+ virtual TestRenderFrameHost* GetMainFrame() override;
+ virtual TestRenderViewHost* GetRenderViewHost() const override;
// WebContentsTester implementation.
- virtual void CommitPendingNavigation() OVERRIDE;
- virtual TestRenderFrameHost* GetPendingMainFrame() const OVERRIDE;
- virtual void NavigateAndCommit(const GURL& url) OVERRIDE;
- virtual void TestSetIsLoading(bool value) OVERRIDE;
- virtual void ProceedWithCrossSiteNavigation() OVERRIDE;
+ virtual void CommitPendingNavigation() override;
+ virtual TestRenderFrameHost* GetPendingMainFrame() const override;
+ virtual void NavigateAndCommit(const GURL& url) override;
+ virtual void TestSetIsLoading(bool value) override;
+ virtual void ProceedWithCrossSiteNavigation() override;
virtual void TestDidNavigate(RenderFrameHost* render_frame_host,
int page_id,
const GURL& url,
- ui::PageTransition transition) OVERRIDE;
+ ui::PageTransition transition) override;
virtual void TestDidNavigateWithReferrer(
RenderFrameHost* render_frame_host,
int page_id,
const GURL& url,
const Referrer& referrer,
- ui::PageTransition transition) OVERRIDE;
- virtual WebPreferences TestComputeWebkitPrefs() OVERRIDE;
+ ui::PageTransition transition) override;
+ virtual WebPreferences TestComputeWebkitPrefs() override;
// State accessor.
bool cross_navigation_pending() {
@@ -61,15 +61,15 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
RenderViewHost* render_view_host,
int opener_route_id,
int proxy_routing_id,
- bool for_main_frame) OVERRIDE;
- virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE {}
+ bool for_main_frame) override;
+ virtual void UpdateRenderViewSizeForRenderManager() override {}
// Returns a clone of this TestWebContents. The returned object is also a
// TestWebContents. The caller owns the returned object.
- virtual WebContents* Clone() OVERRIDE;
+ virtual WebContents* Clone() override;
// Allow mocking of the RenderViewHostDelegateView.
- virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE;
+ virtual RenderViewHostDelegateView* GetDelegateView() override;
void set_delegate_view(RenderViewHostDelegateView* view) {
delegate_view_override_ = view;
}
@@ -91,7 +91,7 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
// to |ExpectSetHistoryLengthAndPrune()|.
virtual void SetHistoryLengthAndPrune(const SiteInstance* site_instance,
int history_length,
- int32 min_page_id) OVERRIDE;
+ int32 min_page_id) override;
void TestDidFinishLoad(const GURL& url);
void TestDidFailLoadWithError(const GURL& url,
@@ -109,19 +109,19 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
int route_id,
int main_frame_route_id,
const ViewHostMsg_CreateWindow_Params& params,
- SessionStorageNamespace* session_storage_namespace) OVERRIDE;
+ SessionStorageNamespace* session_storage_namespace) override;
virtual void CreateNewWidget(int render_process_id,
int route_id,
- blink::WebPopupType popup_type) OVERRIDE;
+ blink::WebPopupType popup_type) override;
virtual void CreateNewFullscreenWidget(int render_process_id,
- int route_id) OVERRIDE;
+ int route_id) override;
virtual void ShowCreatedWindow(int route_id,
WindowOpenDisposition disposition,
const gfx::Rect& initial_pos,
- bool user_gesture) OVERRIDE;
+ bool user_gesture) override;
virtual void ShowCreatedWidget(int route_id,
- const gfx::Rect& initial_pos) OVERRIDE;
- virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE;
+ const gfx::Rect& initial_pos) override;
+ virtual void ShowCreatedFullscreenWidget(int route_id) override;
RenderViewHostDelegateView* delegate_view_override_;
« no previous file with comments | « content/test/test_video_frame_provider.h ('k') | content/test/web_gesture_curve_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698