OLD | NEW |
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 <memory> |
| 11 |
10 #include "base/android/scoped_java_ref.h" | 12 #include "base/android/scoped_java_ref.h" |
11 #include "base/macros.h" | 13 #include "base/macros.h" |
12 #include "base/memory/scoped_ptr.h" | |
13 #include "chrome/browser/ui/website_settings/website_settings_ui.h" | 14 #include "chrome/browser/ui/website_settings/website_settings_ui.h" |
14 | 15 |
15 namespace content { | 16 namespace content { |
16 class WebContents; | 17 class WebContents; |
17 } | 18 } |
18 | 19 |
19 // A Java counterpart will be generated for this enum. | 20 // A Java counterpart will be generated for this enum. |
20 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser | 21 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser |
21 enum PageInfoConnectionType { | 22 enum PageInfoConnectionType { |
22 CONNECTION_UNKNOWN, | 23 CONNECTION_UNKNOWN, |
(...skipping 22 matching lines...) Expand all Loading... |
45 void SetPermissionInfo( | 46 void SetPermissionInfo( |
46 const PermissionInfoList& permission_info_list, | 47 const PermissionInfoList& permission_info_list, |
47 const ChosenObjectInfoList& chosen_object_info_list) override; | 48 const ChosenObjectInfoList& chosen_object_info_list) override; |
48 void SetIdentityInfo(const IdentityInfo& identity_info) override; | 49 void SetIdentityInfo(const IdentityInfo& identity_info) override; |
49 void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) override; | 50 void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) override; |
50 | 51 |
51 static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env); | 52 static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env); |
52 | 53 |
53 private: | 54 private: |
54 // The presenter that controlls the Website Settings UI. | 55 // The presenter that controlls the Website Settings UI. |
55 scoped_ptr<WebsiteSettings> presenter_; | 56 std::unique_ptr<WebsiteSettings> presenter_; |
56 | 57 |
57 // The java prompt implementation. | 58 // The java prompt implementation. |
58 base::android::ScopedJavaGlobalRef<jobject> popup_jobject_; | 59 base::android::ScopedJavaGlobalRef<jobject> popup_jobject_; |
59 | 60 |
60 GURL url_; | 61 GURL url_; |
61 | 62 |
62 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid); | 63 DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid); |
63 }; | 64 }; |
64 | 65 |
65 #endif // CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_ | 66 #endif // CHROME_BROWSER_UI_ANDROID_WEBSITE_SETTINGS_POPUP_ANDROID_H_ |
OLD | NEW |