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

Unified Diff: chrome/browser/ui/android/website_settings_popup_legacy_android.h

Issue 516703002: Replaced the current WebsiteSettings dialog with a new PageInfo dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed "is_android" guard on permission strings. Could have #defined out the function that uses th… Created 6 years, 2 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
Index: chrome/browser/ui/android/website_settings_popup_legacy_android.h
diff --git a/chrome/browser/ui/android/website_settings_popup_android.h b/chrome/browser/ui/android/website_settings_popup_legacy_android.h
similarity index 66%
copy from chrome/browser/ui/android/website_settings_popup_android.h
copy to chrome/browser/ui/android/website_settings_popup_legacy_android.h
index 12cdafa3cab4378d95522835492677f6a32ef6ff..66a8d8f3afa0b89b09fd3835db901c1ae053058d 100644
--- a/chrome/browser/ui/android/website_settings_popup_android.h
+++ b/chrome/browser/ui/android/website_settings_popup_legacy_android.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_
-#define CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_
+#ifndef CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_LEGACY_ANDROID_H_
+#define CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_LEGACY_ANDROID_H_
#include <jni.h>
@@ -17,12 +17,12 @@ class WebContents;
}
// Android implementation of the website settings UI.
-class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
+class WebsiteSettingsPopupLegacyAndroid : public WebsiteSettingsUI {
public:
- WebsiteSettingsPopupAndroid(JNIEnv* env,
- jobject java_website_settings,
- content::WebContents* web_contents);
- virtual ~WebsiteSettingsPopupAndroid();
+ WebsiteSettingsPopupLegacyAndroid(JNIEnv* env,
+ jobject java_website_settings,
+ content::WebContents* web_contents);
+ virtual ~WebsiteSettingsPopupLegacyAndroid();
void Destroy(JNIEnv* env, jobject obj);
// Revokes any current user exceptions for bypassing SSL error interstitials
@@ -37,7 +37,7 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
virtual void SetFirstVisit(const base::string16& first_visit) override;
virtual void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) override;
- static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env);
+ static bool RegisterWebsiteSettingsPopupLegacyAndroid(JNIEnv* env);
private:
// The presenter that controlls the Website Settings UI.
@@ -46,7 +46,7 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
// The java prompt implementation.
base::android::ScopedJavaGlobalRef<jobject> popup_jobject_;
- DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid);
+ DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupLegacyAndroid);
};
-#endif // CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_
+#endif // CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_LEGACY_ANDROID_H_

Powered by Google App Engine
This is Rietveld 408576698