chrome/browser/ui/android/tab_model/tab_model_jni_bridge.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/tab_model/tab_model_jni_bridge.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_contents/chrome_web_contents_view_delegate_android.h ('k') | chrome/browser/ui/android/tab_model/tab_model_list_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h

diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h

index 77a614d2b8456741c7d563980f2aa733859d8c94..0de051d86ad685434ac1048c4fc7ab2d34133775 100644

--- a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h

+++ b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h

@@ -28,7 +28,7 @@ class TabModelJniBridge : public TabModel {

public:

TabModelJniBridge(JNIEnv* env, jobject obj, bool is_incognito);

void Destroy(JNIEnv* env, jobject obj);

- virtual ~TabModelJniBridge();

+ ~TabModelJniBridge() override;

// Registers the JNI bindings.

static bool Register(JNIEnv* env);

@@ -39,22 +39,21 @@ class TabModelJniBridge : public TabModel {

void TabAddedToModel(JNIEnv* env, jobject obj, jobject jtab);

// TabModel::

- virtual int GetTabCount() const override;

- virtual int GetActiveIndex() const override;

- virtual content::WebContents* GetWebContentsAt(int index) const override;

- virtual TabAndroid* GetTabAt(int index) const override;

+ int GetTabCount() const override;

+ int GetActiveIndex() const override;

+ content::WebContents* GetWebContentsAt(int index) const override;

+ TabAndroid* GetTabAt(int index) const override;

- virtual void SetActiveIndex(int index) override;

- virtual void CloseTabAt(int index) override;

+ void SetActiveIndex(int index) override;

+ void CloseTabAt(int index) override;

- virtual void CreateTab(content::WebContents* web_contents,

- int parent_tab_id) override;

+ void CreateTab(content::WebContents* web_contents,

+ int parent_tab_id) override;

- virtual content::WebContents* CreateNewTabForDevTools(

- const GURL& url) override;

+ content::WebContents* CreateNewTabForDevTools(const GURL& url) override;

// Return true if we are currently restoring sessions asynchronously.

- virtual bool IsSessionRestoreInProgress() const override;

+ bool IsSessionRestoreInProgress() const override;

// Instructs the TabModel to broadcast a notification that all tabs are now

// loaded from storage.