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

Side by Side Diff: chrome/browser/ui/android/page_info/website_settings_popup_android.h

Issue 2633433002: Update page info for new search geolocation system. (Closed)
Patch Set: Comment Created 3 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 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_PAGE_INFO_WEBSITE_SETTINGS_POPUP_ANDROID_H_ 5 #ifndef CHROME_BROWSER_UI_ANDROID_PAGE_INFO_WEBSITE_SETTINGS_POPUP_ANDROID_H_
6 #define CHROME_BROWSER_UI_ANDROID_PAGE_INFO_WEBSITE_SETTINGS_POPUP_ANDROID_H_ 6 #define CHROME_BROWSER_UI_ANDROID_PAGE_INFO_WEBSITE_SETTINGS_POPUP_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <memory> 10 #include <memory>
11 11
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 14 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
15 15
16 namespace content { 16 namespace content {
17 class WebContents; 17 class WebContents;
18 } 18 }
19 19
20 class SearchGeolocationService;
21
20 // A Java counterpart will be generated for this enum. 22 // A Java counterpart will be generated for this enum.
21 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser 23 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser
22 enum PageInfoConnectionType { 24 enum PageInfoConnectionType {
23 CONNECTION_UNKNOWN, 25 CONNECTION_UNKNOWN,
24 CONNECTION_ENCRYPTED, 26 CONNECTION_ENCRYPTED,
25 CONNECTION_MIXED_CONTENT, 27 CONNECTION_MIXED_CONTENT,
26 CONNECTION_UNENCRYPTED, 28 CONNECTION_UNENCRYPTED,
27 CONNECTION_ENCRYPTED_ERROR, 29 CONNECTION_ENCRYPTED_ERROR,
28 CONNECTION_INTERNAL_PAGE, 30 CONNECTION_INTERNAL_PAGE,
29 }; 31 };
(...skipping 19 matching lines...) Expand all
49 51
50 static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env); 52 static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env);
51 53
52 private: 54 private:
53 // The presenter that controlls the Website Settings UI. 55 // The presenter that controlls the Website Settings UI.
54 std::unique_ptr<WebsiteSettings> presenter_; 56 std::unique_ptr<WebsiteSettings> presenter_;
55 57
56 // The java prompt implementation. 58 // The java prompt implementation.
57 base::android::ScopedJavaGlobalRef<jobject> popup_jobject_; 59 base::android::ScopedJavaGlobalRef<jobject> popup_jobject_;
58 60
61 // Owned by the profile.
62 SearchGeolocationService* search_geolocation_service_;
63
59 GURL url_; 64 GURL url_;
60 65
61 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid); 66 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid);
62 }; 67 };
63 68
64 #endif // CHROME_BROWSER_UI_ANDROID_PAGE_INFO_WEBSITE_SETTINGS_POPUP_ANDROID_H_ 69 #endif // CHROME_BROWSER_UI_ANDROID_PAGE_INFO_WEBSITE_SETTINGS_POPUP_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698