chrome/browser/ssl/security_state_model_android.cc - Issue 2224193003: Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ssl/security_state_model_android.cc

Issue 2224193003: Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 4 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/ssl/chrome_security_state_model_client_browser_tests.cc ('k') | chrome/browser/ui/website_settings/website_settings.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #include "chrome/browser/ssl/security_state_model_android.h"	5 #include "chrome/browser/ssl/security_state_model_android.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "chrome/browser/ssl/chrome_security_state_model_client.h"	8 #include "chrome/browser/ssl/chrome_security_state_model_client.h"

9 #include "content/public/browser/web_contents.h"	9 #include "content/public/browser/web_contents.h"

10 #include "jni/SecurityStateModel_jni.h"	10 #include "jni/SecurityStateModel_jni.h"

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 const JavaParamRef<jclass>& jcaller,	52 const JavaParamRef<jclass>& jcaller,

53 const JavaParamRef<jobject>& jweb_contents) {	53 const JavaParamRef<jobject>& jweb_contents) {

54 content::WebContents* web_contents =	54 content::WebContents* web_contents =

55 content::WebContents::FromJavaWebContents(jweb_contents);	55 content::WebContents::FromJavaWebContents(jweb_contents);

56 DCHECK(web_contents);	56 DCHECK(web_contents);

57 ChromeSecurityStateModelClient::CreateForWebContents(web_contents);	57 ChromeSecurityStateModelClient::CreateForWebContents(web_contents);

58 ChromeSecurityStateModelClient* model_client =	58 ChromeSecurityStateModelClient* model_client =

59 ChromeSecurityStateModelClient::FromWebContents(web_contents);	59 ChromeSecurityStateModelClient::FromWebContents(web_contents);

60 DCHECK(model_client);	60 DCHECK(model_client);

61 return model_client->GetSecurityInfo().mixed_content_status ==	61 return model_client->GetSecurityInfo().mixed_content_status ==

62 security_state::SecurityStateModel::DISPLAYED_MIXED_CONTENT \|\|	62 security_state::SecurityStateModel::CONTENT_STATUS_DISPLAYED \|\|

63 model_client->GetSecurityInfo().mixed_content_status ==	63 model_client->GetSecurityInfo().mixed_content_status ==

64 security_state::SecurityStateModel::	64 security_state::SecurityStateModel::

65 RAN_AND_DISPLAYED_MIXED_CONTENT;	65 CONTENT_STATUS_DISPLAYED_AND_RAN;

66 }	66 }

OLD	NEW