Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_ 5 #ifndef CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_
6 #define CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_ 6 #define CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 15 matching lines...) Expand all
26 CONNECTION_ENCRYPTED_ERROR, 26 CONNECTION_ENCRYPTED_ERROR,
27 CONNECTION_INTERNAL_PAGE, 27 CONNECTION_INTERNAL_PAGE,
28 }; 28 };
29 29
30 // Android implementation of the website settings UI. 30 // Android implementation of the website settings UI.
31 class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI { 31 class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
32 public: 32 public:
33 WebsiteSettingsPopupAndroid(JNIEnv* env, 33 WebsiteSettingsPopupAndroid(JNIEnv* env,
34 jobject java_website_settings, 34 jobject java_website_settings,
35 content::WebContents* web_contents); 35 content::WebContents* web_contents);
36 virtual ~WebsiteSettingsPopupAndroid(); 36 ~WebsiteSettingsPopupAndroid() override;
37 void Destroy(JNIEnv* env, jobject obj); 37 void Destroy(JNIEnv* env, jobject obj);
38 void OnPermissionSettingChanged(JNIEnv* env, 38 void OnPermissionSettingChanged(JNIEnv* env,
39 jobject obj, 39 jobject obj,
40 jint type, 40 jint type,
41 jint setting); 41 jint setting);
42 42
43 // WebsiteSettingsUI implementations. 43 // WebsiteSettingsUI implementations.
44 virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) override; 44 void SetCookieInfo(const CookieInfoList& cookie_info_list) override;
45 virtual void SetPermissionInfo( 45 void SetPermissionInfo(
46 const PermissionInfoList& permission_info_list) override; 46 const PermissionInfoList& permission_info_list) override;
47 virtual void SetIdentityInfo(const IdentityInfo& identity_info) override; 47 void SetIdentityInfo(const IdentityInfo& identity_info) override;
48 virtual void SetFirstVisit(const base::string16& first_visit) override; 48 void SetFirstVisit(const base::string16& first_visit) override;
49 virtual void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) override; 49 void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) override;
50 50
51 static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env); 51 static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env);
52 52
53 private: 53 private:
54 // The presenter that controlls the Website Settings UI. 54 // The presenter that controlls the Website Settings UI.
55 scoped_ptr<WebsiteSettings> presenter_; 55 scoped_ptr<WebsiteSettings> presenter_;
56 56
57 // The java prompt implementation. 57 // The java prompt implementation.
58 base::android::ScopedJavaGlobalRef<jobject> popup_jobject_; 58 base::android::ScopedJavaGlobalRef<jobject> popup_jobject_;
59 59
60 GURL url_; 60 GURL url_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid); 62 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid);
63 }; 63 };
64 64
65 #endif // CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_ 65 #endif // CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698