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

Unified Diff: content/browser/web_contents/web_contents_view_aura_browsertest.cc

Issue 678973004: Standardize usage of virtual/override/final specifiers. (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/browser/web_contents/web_contents_view_aura.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_view_aura_browsertest.cc
diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
index 3fe96f5bca471f1536c58adc767f562af7b40392..2687376c109e861fcb61ddfb5d088a15f1b52ccd 100644
--- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc
+++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
@@ -57,7 +57,7 @@ void GiveItSomeTime() {
class VerticalOverscrollTracker : public content::WebContentsDelegate {
public:
VerticalOverscrollTracker() : count_(0), completed_(false) {}
- virtual ~VerticalOverscrollTracker() {}
+ ~VerticalOverscrollTracker() override {}
int num_overscroll_updates() const {
return count_;
@@ -73,17 +73,11 @@ class VerticalOverscrollTracker : public content::WebContentsDelegate {
}
private:
- virtual bool CanOverscrollContent() const override {
- return true;
- }
+ bool CanOverscrollContent() const override { return true; }
- virtual void OverscrollUpdate(float delta_y) override {
- ++count_;
- }
+ void OverscrollUpdate(float delta_y) override { ++count_; }
- virtual void OverscrollComplete() override {
- completed_ = true;
- }
+ void OverscrollComplete() override { completed_ = true; }
int count_;
bool completed_;
@@ -105,8 +99,7 @@ class ScreenshotTracker : public NavigationEntryScreenshotManager {
waiting_for_screenshots_(0) {
}
- virtual ~ScreenshotTracker() {
- }
+ ~ScreenshotTracker() override {}
RenderViewHost* screenshot_taken_for() { return screenshot_taken_for_; }
@@ -132,14 +125,14 @@ class ScreenshotTracker : public NavigationEntryScreenshotManager {
private:
// Overridden from NavigationEntryScreenshotManager:
- virtual void TakeScreenshotImpl(RenderViewHost* host,
- NavigationEntryImpl* entry) override {
+ void TakeScreenshotImpl(RenderViewHost* host,
+ NavigationEntryImpl* entry) override {
++waiting_for_screenshots_;
screenshot_taken_for_ = host;
NavigationEntryScreenshotManager::TakeScreenshotImpl(host, entry);
}
- virtual void OnScreenshotSet(NavigationEntryImpl* entry) override {
+ void OnScreenshotSet(NavigationEntryImpl* entry) override {
--waiting_for_screenshots_;
screenshot_set_[entry] = true;
NavigationEntryScreenshotManager::OnScreenshotSet(entry);
@@ -163,7 +156,7 @@ class NavigationWatcher : public WebContentsObserver {
should_quit_loop_(false) {
}
- virtual ~NavigationWatcher() {}
+ ~NavigationWatcher() override {}
void WaitUntilNavigationStarts() {
if (navigated_)
@@ -174,7 +167,7 @@ class NavigationWatcher : public WebContentsObserver {
private:
// Overridden from WebContentsObserver:
- virtual void AboutToNavigateRenderView(RenderViewHost* host) override {
+ void AboutToNavigateRenderView(RenderViewHost* host) override {
navigated_ = true;
if (should_quit_loop_)
base::MessageLoop::current()->Quit();
@@ -203,7 +196,7 @@ class InputEventMessageFilterWaitsForAcks : public BrowserMessageFilter {
InputEventAckState last_ack_state() const { return state_; }
protected:
- virtual ~InputEventMessageFilterWaitsForAcks() {}
+ ~InputEventMessageFilterWaitsForAcks() override {}
private:
void ReceivedEventAck(blink::WebInputEvent::Type type,
@@ -215,7 +208,7 @@ class InputEventMessageFilterWaitsForAcks : public BrowserMessageFilter {
}
// BrowserMessageFilter:
- virtual bool OnMessageReceived(const IPC::Message& message) override {
+ bool OnMessageReceived(const IPC::Message& message) override {
if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) {
InputHostMsg_HandleInputEvent_ACK::Param params;
InputHostMsg_HandleInputEvent_ACK::Read(&message, &params);
@@ -264,7 +257,7 @@ class WebContentsViewAuraTest : public ContentBrowserTest {
controller->SetScreenshotManager(screenshot_manager_);
}
- virtual void SetUpCommandLine(CommandLine* cmd) override {
+ void SetUpCommandLine(CommandLine* cmd) override {
cmd->AppendSwitchASCII(switches::kTouchEvents,
switches::kTouchEventsEnabled);
}
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698