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

Side by Side Diff: chrome/browser/ui/android/website_settings_popup_android.cc

Issue 2327433002: Stop using CertStore which is not compatible with PlzNavigate. (Closed)
Patch Set: remove cert_store on ios Created 4 years, 3 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
« no previous file with comments | « chrome/browser/ui/android/toolbar/toolbar_model_android.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/ui/android/website_settings_popup_android.h" 5 #include "chrome/browser/ui/android/website_settings_popup_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "chrome/browser/infobars/infobar_service.h" 11 #include "chrome/browser/infobars/infobar_service.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ssl/chrome_security_state_model_client.h" 13 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
14 #include "chrome/browser/ui/website_settings/website_settings.h" 14 #include "chrome/browser/ui/website_settings/website_settings.h"
15 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 15 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
16 #include "components/content_settings/core/common/content_settings.h" 16 #include "components/content_settings/core/common/content_settings.h"
17 #include "components/content_settings/core/common/content_settings_types.h" 17 #include "components/content_settings/core/common/content_settings_types.h"
18 #include "content/public/browser/browser_context.h" 18 #include "content/public/browser/browser_context.h"
19 #include "content/public/browser/cert_store.h"
20 #include "content/public/browser/navigation_controller.h" 19 #include "content/public/browser/navigation_controller.h"
21 #include "content/public/browser/navigation_entry.h" 20 #include "content/public/browser/navigation_entry.h"
22 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
23 #include "jni/WebsiteSettingsPopup_jni.h" 22 #include "jni/WebsiteSettingsPopup_jni.h"
24 23
25 using base::android::ConvertUTF16ToJavaString; 24 using base::android::ConvertUTF16ToJavaString;
26 using base::android::ConvertUTF8ToJavaString; 25 using base::android::ConvertUTF8ToJavaString;
27 using base::android::JavaParamRef; 26 using base::android::JavaParamRef;
28 27
29 // static 28 // static
(...skipping 22 matching lines...) Expand all
52 51
53 popup_jobject_.Reset(env, java_website_settings_pop); 52 popup_jobject_.Reset(env, java_website_settings_pop);
54 53
55 ChromeSecurityStateModelClient* security_model_client = 54 ChromeSecurityStateModelClient* security_model_client =
56 ChromeSecurityStateModelClient::FromWebContents(web_contents); 55 ChromeSecurityStateModelClient::FromWebContents(web_contents);
57 DCHECK(security_model_client); 56 DCHECK(security_model_client);
58 57
59 presenter_.reset(new WebsiteSettings( 58 presenter_.reset(new WebsiteSettings(
60 this, Profile::FromBrowserContext(web_contents->GetBrowserContext()), 59 this, Profile::FromBrowserContext(web_contents->GetBrowserContext()),
61 TabSpecificContentSettings::FromWebContents(web_contents), web_contents, 60 TabSpecificContentSettings::FromWebContents(web_contents), web_contents,
62 nav_entry->GetURL(), security_model_client->GetSecurityInfo(), 61 nav_entry->GetURL(), security_model_client->GetSecurityInfo()));
63 content::CertStore::GetInstance()));
64 } 62 }
65 63
66 WebsiteSettingsPopupAndroid::~WebsiteSettingsPopupAndroid() {} 64 WebsiteSettingsPopupAndroid::~WebsiteSettingsPopupAndroid() {}
67 65
68 void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env, 66 void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env,
69 const JavaParamRef<jobject>& obj) { 67 const JavaParamRef<jobject>& obj) {
70 delete this; 68 delete this;
71 } 69 }
72 70
73 void WebsiteSettingsPopupAndroid::RecordWebsiteSettingsAction( 71 void WebsiteSettingsPopupAndroid::RecordWebsiteSettingsAction(
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 WebsiteSettingsUI::TabId tab_id) { 144 WebsiteSettingsUI::TabId tab_id) {
147 // There's no tab UI on Android - only connection info is shown. 145 // There's no tab UI on Android - only connection info is shown.
148 NOTIMPLEMENTED(); 146 NOTIMPLEMENTED();
149 } 147 }
150 148
151 // static 149 // static
152 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( 150 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
153 JNIEnv* env) { 151 JNIEnv* env) {
154 return RegisterNativesImpl(env); 152 return RegisterNativesImpl(env);
155 } 153 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/toolbar/toolbar_model_android.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698