chrome/browser/android/chrome_jni_registrar.cc - Issue 1324293003: Revert of Refactor connection_security into SecurityStateModel

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 1324293003: Revert of Refactor connection_security into SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java ('k') | chrome/browser/android/chrome_web_contents_delegate_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index 6549f193c8908d4dfcad57863c3b17a65946b048..d4b2bdf41cd69479bf188e44729265a11672e6d4 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -99,7 +99,7 @@

#include "chrome/browser/signin/oauth2_token_service_delegate_android.h"

#include "chrome/browser/speech/tts_android.h"

#include "chrome/browser/spellchecker/spellchecker_session_bridge_android.h"

-#include "chrome/browser/ssl/security_state_model_android.h"

+#include "chrome/browser/ssl/connection_security_android.h"

#include "chrome/browser/supervised_user/child_accounts/child_account_feedback_reporter_android.h"

#include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"

#include "chrome/browser/sync/profile_sync_service_android.h"

@@ -218,7 +218,7 @@

{"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},

{"ConnectionInfoPopupAndroid",

ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid},

- {"SecurityStateModel", RegisterSecurityStateModelAndroid},

+ {"ConnectionSecurity", RegisterConnectionSecurityAndroid},

{"ConnectivityChecker", RegisterConnectivityChecker},

{"ContextMenuHelper", RegisterContextMenuHelper},

{"ContextualSearchManager", RegisterContextualSearchManager},