| OLD | NEW |
| 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 "base/android/jni_weak_ref.h" | 8 #include "base/android/jni_weak_ref.h" |
| 9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 jstring jquery); | 38 jstring jquery); |
| 39 base::android::ScopedJavaLocalRef<jstring> GetUrlForVoiceSearchQuery( | 39 base::android::ScopedJavaLocalRef<jstring> GetUrlForVoiceSearchQuery( |
| 40 JNIEnv* env, | 40 JNIEnv* env, |
| 41 jobject obj, | 41 jobject obj, |
| 42 jstring jquery); | 42 jstring jquery); |
| 43 base::android::ScopedJavaLocalRef<jstring> ReplaceSearchTermsInUrl( | 43 base::android::ScopedJavaLocalRef<jstring> ReplaceSearchTermsInUrl( |
| 44 JNIEnv* env, | 44 JNIEnv* env, |
| 45 jobject obj, | 45 jobject obj, |
| 46 jstring jquery, | 46 jstring jquery, |
| 47 jstring jcurrent_url); | 47 jstring jcurrent_url); |
| 48 // TODO(jeremycho): Delete once Clank no longer references it. |
| 48 base::android::ScopedJavaLocalRef<jstring> GetUrlForContextualSearchQuery( | 49 base::android::ScopedJavaLocalRef<jstring> GetUrlForContextualSearchQuery( |
| 49 JNIEnv* env, | 50 JNIEnv* env, |
| 50 jobject obj, | 51 jobject obj, |
| 51 jstring jquery); | 52 jstring jquery); |
| 53 base::android::ScopedJavaLocalRef<jstring> GetUrlForContextualSearchQuery( |
| 54 JNIEnv* env, |
| 55 jobject obj, |
| 56 jstring jquery, |
| 57 jstring jalternate_term); |
| 52 | 58 |
| 53 static bool Register(JNIEnv* env); | 59 static bool Register(JNIEnv* env); |
| 54 | 60 |
| 55 private: | 61 private: |
| 56 ~TemplateUrlServiceAndroid(); | 62 ~TemplateUrlServiceAndroid(); |
| 57 | 63 |
| 58 bool IsPrepopulatedTemplate(TemplateURL* url); | 64 bool IsPrepopulatedTemplate(TemplateURL* url); |
| 59 | 65 |
| 60 void OnTemplateURLServiceLoaded(); | 66 void OnTemplateURLServiceLoaded(); |
| 61 | 67 |
| 62 JavaObjectWeakGlobalRef weak_java_obj_; | 68 JavaObjectWeakGlobalRef weak_java_obj_; |
| 63 | 69 |
| 64 // Pointer to the TemplateUrlService for the main profile. | 70 // Pointer to the TemplateUrlService for the main profile. |
| 65 TemplateURLService* template_url_service_; | 71 TemplateURLService* template_url_service_; |
| 66 | 72 |
| 67 scoped_ptr<TemplateURLService::Subscription> template_url_subscription_; | 73 scoped_ptr<TemplateURLService::Subscription> template_url_subscription_; |
| 68 | 74 |
| 69 DISALLOW_COPY_AND_ASSIGN(TemplateUrlServiceAndroid); | 75 DISALLOW_COPY_AND_ASSIGN(TemplateUrlServiceAndroid); |
| 70 }; | 76 }; |
| 71 | 77 |
| 72 #endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_ | 78 #endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_ |
| OLD | NEW |