chrome/browser/chromeos/login/resource_loader_browsertest.cc - Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome.

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/browser/chromeos/login/resource_loader_browsertest.cc

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 8 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 | « chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h ('k') | chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/resource_loader_browsertest.cc

diff --git a/chrome/browser/chromeos/login/resource_loader_browsertest.cc b/chrome/browser/chromeos/login/resource_loader_browsertest.cc

index 30417759d4cda7fe878d6d0fcfb621b291c10fb3..2053e4690fa98d1aca5707d14ab9a6ed090ee6ec 100644

--- a/chrome/browser/chromeos/login/resource_loader_browsertest.cc

+++ b/chrome/browser/chromeos/login/resource_loader_browsertest.cc

@@ -33,12 +33,12 @@ class ResourceLoaderBrowserTest : public InProcessBrowserTest {

ResourceLoaderBrowserTest() {}

protected:

- virtual void SetUpCommandLine(base::CommandLine* command_line) override {

+ void SetUpCommandLine(base::CommandLine* command_line) override {

// Needed to load file:// URLs in XHRs.

command_line->AppendSwitch(switches::kDisableWebSecurity);

}

- virtual void SetUpOnMainThread() override {

+ void SetUpOnMainThread() override {

// Create the root page containing resource_loader.js.

std::string root_page =

"<html>"