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

Side by Side Diff: chrome/browser/ui/android/connection_info_popup_android.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_CONNECTION_INFO_POPUP_ANDROID_H_ 5 #ifndef CHROME_BROWSER_UI_ANDROID_CONNECTION_INFO_POPUP_ANDROID_H_
6 #define CHROME_BROWSER_UI_ANDROID_CONNECTION_INFO_POPUP_ANDROID_H_ 6 #define CHROME_BROWSER_UI_ANDROID_CONNECTION_INFO_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 // Android implementation of the website settings UI which displays detailed 20 // Android implementation of the website settings UI which displays detailed
20 // connection and certificate information for the website. 21 // connection and certificate information for the website.
21 class ConnectionInfoPopupAndroid : public WebsiteSettingsUI { 22 class ConnectionInfoPopupAndroid : public WebsiteSettingsUI {
22 public: 23 public:
(...skipping 15 matching lines...) Expand all
38 void SetPermissionInfo( 39 void SetPermissionInfo(
39 const PermissionInfoList& permission_info_list, 40 const PermissionInfoList& permission_info_list,
40 const ChosenObjectInfoList& chosen_object_info_list) override; 41 const ChosenObjectInfoList& chosen_object_info_list) override;
41 void SetIdentityInfo(const IdentityInfo& identity_info) override; 42 void SetIdentityInfo(const IdentityInfo& identity_info) override;
42 void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) override; 43 void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) override;
43 44
44 static bool RegisterConnectionInfoPopupAndroid(JNIEnv* env); 45 static bool RegisterConnectionInfoPopupAndroid(JNIEnv* env);
45 46
46 private: 47 private:
47 // The presenter that controlls the Website Settings UI. 48 // The presenter that controlls the Website Settings UI.
48 scoped_ptr<WebsiteSettings> presenter_; 49 std::unique_ptr<WebsiteSettings> presenter_;
49 50
50 // The java prompt implementation. 51 // The java prompt implementation.
51 base::android::ScopedJavaGlobalRef<jobject> popup_jobject_; 52 base::android::ScopedJavaGlobalRef<jobject> popup_jobject_;
52 53
53 DISALLOW_COPY_AND_ASSIGN(ConnectionInfoPopupAndroid); 54 DISALLOW_COPY_AND_ASSIGN(ConnectionInfoPopupAndroid);
54 }; 55 };
55 56
56 #endif // CHROME_BROWSER_UI_ANDROID_CONNECTION_INFO_POPUP_ANDROID_H_ 57 #endif // CHROME_BROWSER_UI_ANDROID_CONNECTION_INFO_POPUP_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698