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

Unified Diff: content/browser/frame_host/navigation_controller_impl_unittest.cc

Issue 667943003: Standardize usage of virtual/override/final in content/browser/ (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
Index: content/browser/frame_host/navigation_controller_impl_unittest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
index 621ab2406df8034bc9100e678b8659bbf37b7884..a1d14ca270278b854b097c866f890a0aa910fd90 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -74,8 +74,7 @@ class MockScreenshotManager : public content::NavigationEntryScreenshotManager {
encoding_screenshot_in_progress_(false) {
}
- virtual ~MockScreenshotManager() {
- }
+ ~MockScreenshotManager() override {}
void TakeScreenshotFor(content::NavigationEntryImpl* entry) {
SkBitmap bitmap;
@@ -100,12 +99,10 @@ class MockScreenshotManager : public content::NavigationEntryScreenshotManager {
private:
// Overridden from content::NavigationEntryScreenshotManager:
- virtual void TakeScreenshotImpl(
- content::RenderViewHost* host,
- content::NavigationEntryImpl* entry) override {
- }
+ void TakeScreenshotImpl(content::RenderViewHost* host,
+ content::NavigationEntryImpl* entry) override {}
- virtual void OnScreenshotSet(content::NavigationEntryImpl* entry) override {
+ void OnScreenshotSet(content::NavigationEntryImpl* entry) override {
encoding_screenshot_in_progress_ = false;
NavigationEntryScreenshotManager::OnScreenshotSet(entry);
if (message_loop_runner_.get())
@@ -196,13 +193,13 @@ class NavigationControllerTest
}
// WebContentsObserver:
- virtual void DidStartNavigationToPendingEntry(
+ void DidStartNavigationToPendingEntry(
const GURL& url,
NavigationController::ReloadType reload_type) override {
navigated_url_ = url;
}
- virtual void NavigationEntryCommitted(
+ void NavigationEntryCommitted(
const LoadCommittedDetails& load_details) override {
navigation_entry_committed_counter_++;
}
@@ -247,12 +244,12 @@ class TestWebContentsDelegate : public WebContentsDelegate {
}
// Keep track of whether the tab has notified us of a navigation state change.
- virtual void NavigationStateChanged(const WebContents* source,
- InvalidateTypes changed_flags) override {
+ void NavigationStateChanged(const WebContents* source,
+ InvalidateTypes changed_flags) override {
navigation_state_change_count_++;
}
- virtual void ShowRepostFormWarningDialog(WebContents* source) override {
+ void ShowRepostFormWarningDialog(WebContents* source) override {
repost_form_warning_count_++;
}
@@ -2292,9 +2289,9 @@ class PrunedListener : public NotificationObserver {
Source<NavigationController>(controller));
}
- virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) override {
+ void Observe(int type,
+ const NotificationSource& source,
+ const NotificationDetails& details) override {
if (type == NOTIFICATION_NAV_LIST_PRUNED) {
notification_count_++;
details_ = *(Details<PrunedDetails>(details).ptr());
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl.h ('k') | content/browser/frame_host/navigation_entry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698