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

Side by Side Diff: chrome/browser/android/url_utilities.cc

Issue 1843063002: Don't show scheme in permission prompts if it is HTTPS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 | « no previous file | chrome/browser/download/notification/download_item_notification.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 <string> 5 #include <string>
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "components/google/core/browser/google_util.h" 9 #include "components/google/core/browser/google_util.h"
10 #include "components/url_formatter/elide_url.h" 10 #include "components/url_formatter/elide_url.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 return base::android::ConvertUTF16ToJavaString( 89 return base::android::ConvertUTF16ToJavaString(
90 env, url_formatter::FormatUrlForSecurityDisplay( 90 env, url_formatter::FormatUrlForSecurityDisplay(
91 ConvertJavaStringToGURL(env, url))); 91 ConvertJavaStringToGURL(env, url)));
92 } 92 }
93 93
94 static ScopedJavaLocalRef<jstring> FormatUrlForSecurityDisplayOmitScheme( 94 static ScopedJavaLocalRef<jstring> FormatUrlForSecurityDisplayOmitScheme(
95 JNIEnv* env, 95 JNIEnv* env,
96 const JavaParamRef<jclass>& clazz, 96 const JavaParamRef<jclass>& clazz,
97 const JavaParamRef<jstring>& url) { 97 const JavaParamRef<jstring>& url) {
98 return base::android::ConvertUTF16ToJavaString( 98 return base::android::ConvertUTF16ToJavaString(
99 env, url_formatter::FormatUrlForSecurityDisplayOmitScheme( 99 env, url_formatter::FormatUrlForSecurityDisplay(
100 ConvertJavaStringToGURL(env, url))); 100 ConvertJavaStringToGURL(env, url),
101 url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS));
101 } 102 }
102 103
103 static jboolean IsGoogleHomePageUrl(JNIEnv* env, 104 static jboolean IsGoogleHomePageUrl(JNIEnv* env,
104 const JavaParamRef<jclass>& clazz, 105 const JavaParamRef<jclass>& clazz,
105 const JavaParamRef<jstring>& url) { 106 const JavaParamRef<jstring>& url) {
106 GURL gurl = ConvertJavaStringToGURL(env, url); 107 GURL gurl = ConvertJavaStringToGURL(env, url);
107 if (gurl.is_empty()) 108 if (gurl.is_empty())
108 return false; 109 return false;
109 return google_util::IsGoogleHomePageUrl(gurl); 110 return google_util::IsGoogleHomePageUrl(gurl);
110 } 111 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 return !gurl2.is_empty(); 154 return !gurl2.is_empty();
154 if (!gurl.is_valid() || !gurl2.is_valid()) 155 if (!gurl.is_valid() || !gurl2.is_valid())
155 return true; 156 return true;
156 return gurl.ref() != gurl2.ref(); 157 return gurl.ref() != gurl2.ref();
157 } 158 }
158 159
159 // Register native methods 160 // Register native methods
160 bool RegisterUrlUtilities(JNIEnv* env) { 161 bool RegisterUrlUtilities(JNIEnv* env) {
161 return RegisterNativesImpl(env); 162 return RegisterNativesImpl(env);
162 } 163 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/download/notification/download_item_notification.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698