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

Side by Side Diff: chrome/browser/search_engines/template_url_service_android.h

Issue 2367373003: [Android] Allow setting recently visited search engines as default search engine (Closed)
Patch Set: Update based on Ian's comments and fix bugs caused by test cases. Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_ 5 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_
6 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_ 6 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
11 #include "base/android/scoped_java_ref.h" 11 #include "base/android/scoped_java_ref.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "components/search_engines/template_url_service.h" 13 #include "components/search_engines/template_url_service.h"
14 #include "components/search_engines/template_url_service_observer.h" 14 #include "components/search_engines/template_url_service_observer.h"
15 15
16 class TemplateURL; 16 class TemplateURL;
17 17
18 18
19 // Android wrapper of the TemplateUrlService which provides access from the Java 19 // Android wrapper of the TemplateUrlService which provides access from the Java
20 // layer. Note that on Android, there's only a single profile, and therefore 20 // layer. Note that on Android, there's only a single profile, and therefore
21 // a single instance of this wrapper. 21 // a single instance of this wrapper.
22 class TemplateUrlServiceAndroid : public TemplateURLServiceObserver { 22 class TemplateUrlServiceAndroid : public TemplateURLServiceObserver {
23 public: 23 public:
24 TemplateUrlServiceAndroid(JNIEnv* env, jobject obj); 24 TemplateUrlServiceAndroid(JNIEnv* env, jobject obj);
25 25
26 void Load(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 26 void Load(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
27 void SetUserSelectedDefaultSearchProvider( 27 void SetUserSelectedDefaultSearchProvider(
28 JNIEnv* env, 28 JNIEnv* env,
29 const base::android::JavaParamRef<jobject>& obj, 29 const base::android::JavaParamRef<jobject>& obj,
30 jint selected_index); 30 const base::android::JavaParamRef<jstring>& jkeyword);
31 jint GetDefaultSearchProvider( 31 jint GetDefaultSearchProvider(
32 JNIEnv* env, 32 JNIEnv* env,
33 const base::android::JavaParamRef<jobject>& obj); 33 const base::android::JavaParamRef<jobject>& obj);
34 jint GetTemplateUrlCount(JNIEnv* env, 34 jint GetTemplateUrlCount(JNIEnv* env,
35 const base::android::JavaParamRef<jobject>& obj); 35 const base::android::JavaParamRef<jobject>& obj);
36 jboolean IsLoaded(JNIEnv* env, 36 jboolean IsLoaded(JNIEnv* env,
37 const base::android::JavaParamRef<jobject>& obj); 37 const base::android::JavaParamRef<jobject>& obj);
38 base::android::ScopedJavaLocalRef<jobject> GetTemplateUrlAt( 38 base::android::ScopedJavaLocalRef<jobject> GetTemplateUrlAt(
39 JNIEnv* env, 39 JNIEnv* env,
40 const base::android::JavaParamRef<jobject>& obj, 40 const base::android::JavaParamRef<jobject>& obj,
(...skipping 23 matching lines...) Expand all
64 base::android::ScopedJavaLocalRef<jstring> GetUrlForContextualSearchQuery( 64 base::android::ScopedJavaLocalRef<jstring> GetUrlForContextualSearchQuery(
65 JNIEnv* env, 65 JNIEnv* env,
66 const base::android::JavaParamRef<jobject>& obj, 66 const base::android::JavaParamRef<jobject>& obj,
67 const base::android::JavaParamRef<jstring>& jquery, 67 const base::android::JavaParamRef<jstring>& jquery,
68 const base::android::JavaParamRef<jstring>& jalternate_term, 68 const base::android::JavaParamRef<jstring>& jalternate_term,
69 jboolean jshould_prefetch, 69 jboolean jshould_prefetch,
70 const base::android::JavaParamRef<jstring>& jprotocol_version); 70 const base::android::JavaParamRef<jstring>& jprotocol_version);
71 base::android::ScopedJavaLocalRef<jstring> GetSearchEngineUrlFromTemplateUrl( 71 base::android::ScopedJavaLocalRef<jstring> GetSearchEngineUrlFromTemplateUrl(
72 JNIEnv* env, 72 JNIEnv* env,
73 const base::android::JavaParamRef<jobject>& obj, 73 const base::android::JavaParamRef<jobject>& obj,
74 jint index); 74 const base::android::JavaParamRef<jstring>& jkeyword);
75 75
76 static bool Register(JNIEnv* env); 76 static bool Register(JNIEnv* env);
77 77
78 private: 78 private:
79 ~TemplateUrlServiceAndroid() override; 79 ~TemplateUrlServiceAndroid() override;
80 80
81 bool IsInDefaultList(TemplateURL* url);
82
81 bool IsPrepopulatedTemplate(TemplateURL* url); 83 bool IsPrepopulatedTemplate(TemplateURL* url);
82 84
83 void OnTemplateURLServiceLoaded(); 85 void OnTemplateURLServiceLoaded();
84 86
85 // TemplateUrlServiceObserver: 87 // TemplateUrlServiceObserver:
86 void OnTemplateURLServiceChanged() override; 88 void OnTemplateURLServiceChanged() override;
87 89
88 JavaObjectWeakGlobalRef weak_java_obj_; 90 JavaObjectWeakGlobalRef weak_java_obj_;
89 91
90 // Pointer to the TemplateUrlService for the main profile. 92 // Pointer to the TemplateUrlService for the main profile.
91 TemplateURLService* template_url_service_; 93 TemplateURLService* template_url_service_;
92 94
93 std::unique_ptr<TemplateURLService::Subscription> template_url_subscription_; 95 std::unique_ptr<TemplateURLService::Subscription> template_url_subscription_;
94 96
95 DISALLOW_COPY_AND_ASSIGN(TemplateUrlServiceAndroid); 97 DISALLOW_COPY_AND_ASSIGN(TemplateUrlServiceAndroid);
98
99 std::vector<TemplateURL*> template_url_list_;
Peter Kasting 2016/10/28 23:05:15 Nit: Goes above DISALLOW_COPY_AND_ASSIGN. Avoid u
ltian 2016/10/31 21:40:17 Done.
96 }; 100 };
97 101
98 #endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_ 102 #endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698