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

Unified Diff: chrome/browser/ui/android/bluetooth_chooser_android.cc

Issue 1473523002: Switch SecurityStateModel ownership to ChromeSecurityStateModelClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/android/bluetooth_chooser_android.cc
diff --git a/chrome/browser/ui/android/bluetooth_chooser_android.cc b/chrome/browser/ui/android/bluetooth_chooser_android.cc
index 0b35ad4d211507c78c85ac797f98aadbc414eea5..a289bfc6c7d4ff8d2edc2b5409e6f8b632cc07a3 100644
--- a/chrome/browser/ui/android/bluetooth_chooser_android.cc
+++ b/chrome/browser/ui/android/bluetooth_chooser_android.cc
@@ -7,6 +7,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ssl/chrome_security_state_model_client.h"
#include "chrome/browser/ssl/security_state_model.h"
#include "chrome/browser/ui/android/window_android_helper.h"
#include "content/public/browser/android/content_view_core.h"
@@ -27,9 +28,9 @@ BluetoothChooserAndroid::BluetoothChooserAndroid(
content::ContentViewCore::FromWebContents(
web_contents)->GetWindowAndroid()->GetJavaObject();
- SecurityStateModel* security_model =
- SecurityStateModel::FromWebContents(web_contents);
- DCHECK(security_model);
+ ChromeSecurityStateModelClient* security_model_delegate =
+ ChromeSecurityStateModelClient::FromWebContents(web_contents);
+ DCHECK(security_model_delegate);
// Create (and show) the BluetoothChooser dialog.
JNIEnv* env = AttachCurrentThread();
@@ -37,7 +38,7 @@ BluetoothChooserAndroid::BluetoothChooserAndroid(
ConvertUTF8ToJavaString(env, origin.spec());
java_dialog_.Reset(Java_BluetoothChooserDialog_create(
env, window_android.obj(), origin_string.obj(),
- security_model->GetSecurityInfo().security_level,
+ security_model_delegate->GetSecurityInfo().security_level,
reinterpret_cast<intptr_t>(this)));
}

Powered by Google App Engine
This is Rietveld 408576698