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

Side by Side Diff: chrome/browser/ui/android/toolbar/toolbar_model_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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/toolbar/toolbar_model_android.h" 5 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/search/search.h" 10 #include "chrome/browser/search/search.h"
11 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" 11 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
12 #include "components/toolbar/toolbar_model_impl.h" 12 #include "components/toolbar/toolbar_model_impl.h"
13 #include "content/public/browser/cert_store.h"
14 #include "content/public/browser/navigation_entry.h" 13 #include "content/public/browser/navigation_entry.h"
15 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
16 #include "content/public/common/content_constants.h" 15 #include "content/public/common/content_constants.h"
17 #include "content/public/common/ssl_status.h" 16 #include "content/public/common/ssl_status.h"
18 #include "jni/ToolbarModel_jni.h" 17 #include "jni/ToolbarModel_jni.h"
19 #include "net/cert/x509_certificate.h" 18 #include "net/cert/x509_certificate.h"
20 19
21 using base::android::JavaParamRef; 20 using base::android::JavaParamRef;
22 using base::android::ScopedJavaLocalRef; 21 using base::android::ScopedJavaLocalRef;
23 22
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 return RegisterNativesImpl(env); 54 return RegisterNativesImpl(env);
56 } 55 }
57 56
58 // static 57 // static
59 jlong Init(JNIEnv* env, 58 jlong Init(JNIEnv* env,
60 const JavaParamRef<jobject>& obj, 59 const JavaParamRef<jobject>& obj,
61 const JavaParamRef<jobject>& delegate) { 60 const JavaParamRef<jobject>& delegate) {
62 ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate); 61 ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate);
63 return reinterpret_cast<intptr_t>(toolbar_model); 62 return reinterpret_cast<intptr_t>(toolbar_model);
64 } 63 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698