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

Side by Side Diff: chrome/browser/ui/browser_instant_controller_unittest.cc

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 }; 55 };
56 56
57 class FakeWebContentsObserver : public content::WebContentsObserver { 57 class FakeWebContentsObserver : public content::WebContentsObserver {
58 public: 58 public:
59 explicit FakeWebContentsObserver(content::WebContents* contents) 59 explicit FakeWebContentsObserver(content::WebContents* contents)
60 : WebContentsObserver(contents), 60 : WebContentsObserver(contents),
61 contents_(contents), 61 contents_(contents),
62 url_(contents->GetURL()), 62 url_(contents->GetURL()),
63 num_reloads_(0) {} 63 num_reloads_(0) {}
64 64
65 virtual void DidStartNavigationToPendingEntry( 65 void DidStartNavigationToPendingEntry(
66 const GURL& url, 66 const GURL& url,
67 content::NavigationController::ReloadType reload_type) override { 67 content::NavigationController::ReloadType reload_type) override {
68 if (url_ == url) 68 if (url_ == url)
69 num_reloads_++; 69 num_reloads_++;
70 } 70 }
71 71
72 const GURL url() const { 72 const GURL url() const {
73 return url_; 73 return url_;
74 } 74 }
75 75
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 180
181 browser.reset(NULL); 181 browser.reset(NULL);
182 window.reset(NULL); 182 window.reset(NULL);
183 EXPECT_FALSE(IsInstantServiceObserver(bic)) 183 EXPECT_FALSE(IsInstantServiceObserver(bic))
184 << "New BrowserInstantController should register as InstantServiceObserver"; 184 << "New BrowserInstantController should register as InstantServiceObserver";
185 } 185 }
186 186
187 } // namespace 187 } // namespace
188 188
189 } // namespace chrome 189 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698