Index: content/browser/web_contents/web_contents_impl_browsertest.cc |
diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc |
index 5159281dcb0fbab868aff6df80741f836ce482e0..d2df9c1c7b78ffd9d833ff34c9bcf46cd46b688a 100644 |
--- a/content/browser/web_contents/web_contents_impl_browsertest.cc |
+++ b/content/browser/web_contents/web_contents_impl_browsertest.cc |
@@ -65,7 +65,7 @@ class LoadStopNotificationObserver : public WindowedNotificationObserver { |
} |
virtual void Observe(int type, |
const NotificationSource& source, |
- const NotificationDetails& details) OVERRIDE { |
+ const NotificationDetails& details) override { |
if (type == NOTIFICATION_LOAD_STOP) { |
const Details<LoadNotificationDetails> load_details(details); |
url_ = load_details->url; |
@@ -94,7 +94,7 @@ class NavigateOnCommitObserver : public WebContentsObserver { |
// WebContentsObserver: |
virtual void NavigationEntryCommitted( |
- const LoadCommittedDetails& load_details) OVERRIDE { |
+ const LoadCommittedDetails& load_details) override { |
if (!done_) { |
done_ = true; |
shell_->Stop(); |
@@ -115,7 +115,7 @@ class RenderViewSizeDelegate : public WebContentsDelegate { |
// WebContentsDelegate: |
virtual gfx::Size GetSizeForNewRenderView( |
- WebContents* web_contents) const OVERRIDE { |
+ WebContents* web_contents) const override { |
gfx::Size size(web_contents->GetContainerBounds().size()); |
size.Enlarge(size_insets_.width(), size_insets_.height()); |
return size; |
@@ -134,13 +134,13 @@ class RenderViewSizeObserver : public WebContentsObserver { |
} |
// WebContentsObserver: |
- virtual void RenderViewCreated(RenderViewHost* rvh) OVERRIDE { |
+ virtual void RenderViewCreated(RenderViewHost* rvh) override { |
rwhv_create_size_ = rvh->GetView()->GetViewBounds().size(); |
} |
virtual void DidStartNavigationToPendingEntry( |
const GURL& url, |
- NavigationController::ReloadType reload_type) OVERRIDE { |
+ NavigationController::ReloadType reload_type) override { |
ResizeWebContentsView(shell_, wcv_new_size_, false); |
} |
@@ -161,7 +161,7 @@ class LoadingStateChangedDelegate : public WebContentsDelegate { |
// WebContentsDelegate: |
virtual void LoadingStateChanged(WebContents* contents, |
- bool to_different_document) OVERRIDE { |
+ bool to_different_document) override { |
loadingStateChangedCount_++; |
if (to_different_document) |
loadingStateToDifferentDocumentCount_++; |
@@ -385,7 +385,7 @@ class RenderFrameCreatedObserver : public WebContentsObserver { |
last_rfh_(NULL) { |
} |
- virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) OVERRIDE { |
+ virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override { |
last_rfh_ = render_frame_host; |
} |
@@ -490,21 +490,21 @@ struct LoadProgressDelegateAndObserver : public WebContentsDelegate, |
// WebContentsDelegate: |
virtual void LoadProgressChanged(WebContents* source, |
- double progress) OVERRIDE { |
+ double progress) override { |
EXPECT_TRUE(did_start_loading); |
EXPECT_FALSE(did_stop_loading); |
progresses.push_back(progress); |
} |
// WebContentsObserver: |
- virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE { |
+ virtual void DidStartLoading(RenderViewHost* render_view_host) override { |
EXPECT_FALSE(did_start_loading); |
EXPECT_EQ(0U, progresses.size()); |
EXPECT_FALSE(did_stop_loading); |
did_start_loading = true; |
} |
- virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE { |
+ virtual void DidStopLoading(RenderViewHost* render_view_host) override { |
EXPECT_TRUE(did_start_loading); |
EXPECT_GE(progresses.size(), 1U); |
EXPECT_FALSE(did_stop_loading); |
@@ -543,7 +543,7 @@ struct FirstVisuallyNonEmptyPaintObserver : public WebContentsObserver { |
: WebContentsObserver(shell->web_contents()), |
did_fist_visually_non_empty_paint_(false) {} |
- virtual void DidFirstVisuallyNonEmptyPaint() OVERRIDE { |
+ virtual void DidFirstVisuallyNonEmptyPaint() override { |
did_fist_visually_non_empty_paint_ = true; |
on_did_first_visually_non_empty_paint_.Run(); |
} |