chrome/browser/ui/android/toolbar/toolbar_model_android.h - Issue 900733003: Update {virtual,override,final} to follow C++11 style.

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/ui/android/toolbar/toolbar_model_android.h

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

Patch Set: rebase Created 5 years, 11 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/ui/android/tab_model/tab_model_unittest.cc ('k') | chrome/browser/ui/android/website_settings_popup_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/toolbar/toolbar_model_android.h

diff --git a/chrome/browser/ui/android/toolbar/toolbar_model_android.h b/chrome/browser/ui/android/toolbar/toolbar_model_android.h

index 210f17ec13844afec9e8c9752ce4069d232c0d7b..60015e47c1d5710fe5cb8215536443e6c935f242 100644

--- a/chrome/browser/ui/android/toolbar/toolbar_model_android.h

+++ b/chrome/browser/ui/android/toolbar/toolbar_model_android.h

@@ -21,7 +21,7 @@ class WebContents;

class ToolbarModelAndroid : public ToolbarModelDelegate {

public:

explicit ToolbarModelAndroid(JNIEnv* env, jobject jdelegate);

- virtual ~ToolbarModelAndroid();

+ ~ToolbarModelAndroid() override;

void Destroy(JNIEnv* env, jobject obj);

base::android::ScopedJavaLocalRef<jstring> GetText(

@@ -35,8 +35,8 @@ class ToolbarModelAndroid : public ToolbarModelDelegate {

jobject obj);

// ToolbarDelegate:

- virtual content::WebContents* GetActiveWebContents() const override;

- virtual bool InTabbedBrowser() const override;

+ content::WebContents* GetActiveWebContents() const override;

+ bool InTabbedBrowser() const override;

static bool RegisterToolbarModelAndroid(JNIEnv* env);