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

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

Issue 1311963005: dbg Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switch to an existing tab experiment Created 5 years 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/about_flags.cc ('k') | chrome/common/chrome_switches.h » ('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 28 matching lines...) Expand all
39 GURL url_2 = ConvertJavaStringToGURL(env, url_2_str); 39 GURL url_2 = ConvertJavaStringToGURL(env, url_2_str);
40 40
41 net::registry_controlled_domains::PrivateRegistryFilter filter = 41 net::registry_controlled_domains::PrivateRegistryFilter filter =
42 GetRegistryFilter(include_private); 42 GetRegistryFilter(include_private);
43 43
44 return net::registry_controlled_domains::SameDomainOrHost(url_1, 44 return net::registry_controlled_domains::SameDomainOrHost(url_1,
45 url_2, 45 url_2,
46 filter); 46 filter);
47 } 47 }
48 48
49 static jboolean SameHost(JNIEnv* env,
50 const JavaParamRef<jclass>& clazz,
51 const JavaParamRef<jstring>& url_1_str,
52 const JavaParamRef<jstring>& url_2_str) {
53 GURL url_1 = ConvertJavaStringToGURL(env, url_1_str);
54 GURL url_2 = ConvertJavaStringToGURL(env, url_2_str);
55 return url_1.host() == url_2.host();
56 }
57
49 static ScopedJavaLocalRef<jstring> GetDomainAndRegistry( 58 static ScopedJavaLocalRef<jstring> GetDomainAndRegistry(
50 JNIEnv* env, 59 JNIEnv* env,
51 const JavaParamRef<jclass>& clazz, 60 const JavaParamRef<jclass>& clazz,
52 const JavaParamRef<jstring>& url, 61 const JavaParamRef<jstring>& url,
53 jboolean include_private) { 62 jboolean include_private) {
54 DCHECK(url); 63 DCHECK(url);
55 GURL gurl = ConvertJavaStringToGURL(env, url); 64 GURL gurl = ConvertJavaStringToGURL(env, url);
56 if (gurl.is_empty()) 65 if (gurl.is_empty())
57 return ScopedJavaLocalRef<jstring>(); 66 return ScopedJavaLocalRef<jstring>();
58 67
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 123
115 return fixed_url.is_valid() 124 return fixed_url.is_valid()
116 ? base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()) 125 ? base::android::ConvertUTF8ToJavaString(env, fixed_url.spec())
117 : ScopedJavaLocalRef<jstring>(); 126 : ScopedJavaLocalRef<jstring>();
118 } 127 }
119 128
120 // Register native methods 129 // Register native methods
121 bool RegisterUrlUtilities(JNIEnv* env) { 130 bool RegisterUrlUtilities(JNIEnv* env) {
122 return RegisterNativesImpl(env); 131 return RegisterNativesImpl(env);
123 } 132 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698