chrome/test/base/web_ui_browser_test.cc - Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/base/web_ui_browser_test.cc

Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test (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: chrome/test/base/web_ui_browser_test.cc

diff --git a/chrome/test/base/web_ui_browser_test.cc b/chrome/test/base/web_ui_browser_test.cc

index 997c14aefb3c7b6fda34a14eb3681b0567be44e1..77bfe917d4e4cf4142de45caf4c18b2b13c41c05 100644

--- a/chrome/test/base/web_ui_browser_test.cc

+++ b/chrome/test/base/web_ui_browser_test.cc

@@ -71,7 +71,7 @@ class WebUIJsInjectionReadyObserver : public content::WebContentsObserver {

preload_test_fixture_(preload_test_fixture),

preload_test_name_(preload_test_name) {}

- virtual void RenderViewCreated(content::RenderViewHost* rvh) OVERRIDE {

+ virtual void RenderViewCreated(content::RenderViewHost* rvh) override {

browser_test_->PreLoadJavascriptLibraries(

preload_test_fixture_, preload_test_name_, rvh);

}

@@ -243,7 +243,7 @@ class PrintContentBrowserClient : public chrome::ChromeContentBrowserClient {

private:

// ChromeContentBrowserClient implementation:

virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(

- content::WebContents* web_contents) OVERRIDE {

+ content::WebContents* web_contents) override {

preview_dialog_ = web_contents;

observer_.reset(new WebUIJsInjectionReadyObserver(preview_dialog_,

browser_test_,

@@ -319,20 +319,20 @@ class MockWebUIDataSource : public content::URLDataSource {

private:

virtual ~MockWebUIDataSource() {}

- virtual std::string GetSource() const OVERRIDE { return "dummyurl"; }

+ virtual std::string GetSource() const override { return "dummyurl"; }

virtual void StartDataRequest(

const std::string& path,

int render_process_id,

int render_frame_id,

- const content::URLDataSource::GotDataCallback& callback) OVERRIDE {

+ const content::URLDataSource::GotDataCallback& callback) override {

std::string dummy_html = "<html><body>Dummy</body></html>";

scoped_refptr<base::RefCountedString> response =

base::RefCountedString::TakeString(&dummy_html);

callback.Run(response.get());

}

- virtual std::string GetMimeType(const std::string& path) const OVERRIDE {

+ virtual std::string GetMimeType(const std::string& path) const override {

return "text/html";

}

@@ -348,7 +348,7 @@ class MockWebUIProvider

// Returns a new WebUI

virtual WebUIController* NewWebUI(content::WebUI* web_ui,

- const GURL& url) OVERRIDE {

+ const GURL& url) override {

WebUIController* controller = new content::WebUIController(web_ui);

Profile* profile = Profile::FromWebUI(web_ui);

content::URLDataSource::Add(profile, new MockWebUIDataSource());

« no previous file with comments | « chrome/test/base/web_ui_browser_test.h ('k') | chrome/test/base/web_ui_browser_test_browsertest.cc » ('j') | no next file with comments »