chrome/browser/ui/android/website_settings_popup_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/website_settings_popup_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, 10 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/toolbar/toolbar_model_android.h ('k') | chrome/browser/ui/android/website_settings_popup_legacy_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/website_settings_popup_android.h

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

index 57f5ec00424c8a782ebe8a9738982368ce582ec1..33bb7713c9df5c2a733b0014353cd6f4dbafea72 100644

--- a/chrome/browser/ui/android/website_settings_popup_android.h

+++ b/chrome/browser/ui/android/website_settings_popup_android.h

@@ -33,7 +33,7 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {

WebsiteSettingsPopupAndroid(JNIEnv* env,

jobject java_website_settings,

content::WebContents* web_contents);

- virtual ~WebsiteSettingsPopupAndroid();

+ ~WebsiteSettingsPopupAndroid() override;

void Destroy(JNIEnv* env, jobject obj);

void OnPermissionSettingChanged(JNIEnv* env,

jobject obj,

@@ -41,12 +41,12 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {

jint setting);

// WebsiteSettingsUI implementations.

- virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) override;

- virtual void SetPermissionInfo(

+ void SetCookieInfo(const CookieInfoList& cookie_info_list) override;

+ void SetPermissionInfo(

const PermissionInfoList& permission_info_list) override;

- virtual void SetIdentityInfo(const IdentityInfo& identity_info) override;

- virtual void SetFirstVisit(const base::string16& first_visit) override;

- virtual void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) override;

+ void SetIdentityInfo(const IdentityInfo& identity_info) override;

+ void SetFirstVisit(const base::string16& first_visit) override;

+ void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) override;

static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env);