OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/android/omnibox/autocomplete_controller_android.h" | 5 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h" |
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 "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
12 #include "base/time/time.h" | 12 #include "base/time/time.h" |
13 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
14 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 14 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
15 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 15 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
16 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 16 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
17 #include "chrome/browser/autocomplete/autocomplete_input.h" | 17 #include "chrome/browser/autocomplete/autocomplete_input.h" |
18 #include "chrome/browser/autocomplete/autocomplete_match.h" | 18 #include "chrome/browser/autocomplete/autocomplete_match.h" |
19 #include "chrome/browser/autocomplete/search_provider.h" | |
19 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" | 20 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" |
20 #include "chrome/browser/browser_process.h" | 21 #include "chrome/browser/browser_process.h" |
21 #include "chrome/browser/chrome_notification_types.h" | 22 #include "chrome/browser/chrome_notification_types.h" |
22 #include "chrome/browser/omnibox/omnibox_field_trial.h" | 23 #include "chrome/browser/omnibox/omnibox_field_trial.h" |
23 #include "chrome/browser/omnibox/omnibox_log.h" | 24 #include "chrome/browser/omnibox/omnibox_log.h" |
24 #include "chrome/browser/profiles/incognito_helpers.h" | 25 #include "chrome/browser/profiles/incognito_helpers.h" |
25 #include "chrome/browser/profiles/profile_android.h" | 26 #include "chrome/browser/profiles/profile_android.h" |
26 #include "chrome/browser/profiles/profile_manager.h" | 27 #include "chrome/browser/profiles/profile_manager.h" |
28 #include "chrome/browser/search/search.h" | |
27 #include "chrome/browser/search_engines/template_url_service.h" | 29 #include "chrome/browser/search_engines/template_url_service.h" |
28 #include "chrome/browser/search_engines/template_url_service_factory.h" | 30 #include "chrome/browser/search_engines/template_url_service_factory.h" |
29 #include "chrome/browser/sessions/session_id.h" | 31 #include "chrome/browser/sessions/session_id.h" |
32 #include "chrome/browser/ui/search/instant_search_prerenderer.h" | |
30 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 33 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
31 #include "chrome/common/autocomplete_match_type.h" | 34 #include "chrome/common/autocomplete_match_type.h" |
35 #include "chrome/common/instant_types.h" | |
32 #include "chrome/common/pref_names.h" | 36 #include "chrome/common/pref_names.h" |
33 #include "chrome/common/url_constants.h" | 37 #include "chrome/common/url_constants.h" |
34 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 38 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
35 #include "content/public/browser/notification_details.h" | 39 #include "content/public/browser/notification_details.h" |
36 #include "content/public/browser/notification_service.h" | 40 #include "content/public/browser/notification_service.h" |
37 #include "content/public/browser/notification_source.h" | 41 #include "content/public/browser/notification_source.h" |
38 #include "content/public/browser/web_contents.h" | 42 #include "content/public/browser/web_contents.h" |
39 #include "content/public/common/url_constants.h" | 43 #include "content/public/common/url_constants.h" |
40 #include "jni/AutocompleteController_jni.h" | 44 #include "jni/AutocompleteController_jni.h" |
41 #include "net/base/escape.h" | 45 #include "net/base/escape.h" |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
322 AutocompleteControllerAndroid::~AutocompleteControllerAndroid() { | 326 AutocompleteControllerAndroid::~AutocompleteControllerAndroid() { |
323 } | 327 } |
324 | 328 |
325 void AutocompleteControllerAndroid::InitJNI(JNIEnv* env, jobject obj) { | 329 void AutocompleteControllerAndroid::InitJNI(JNIEnv* env, jobject obj) { |
326 weak_java_autocomplete_controller_android_ = | 330 weak_java_autocomplete_controller_android_ = |
327 JavaObjectWeakGlobalRef(env, obj); | 331 JavaObjectWeakGlobalRef(env, obj); |
328 } | 332 } |
329 | 333 |
330 void AutocompleteControllerAndroid::OnResultChanged( | 334 void AutocompleteControllerAndroid::OnResultChanged( |
331 bool default_match_changed) { | 335 bool default_match_changed) { |
336 if (default_match_changed && | |
Jered
2014/06/13 16:53:20
AutocompleteController::OnResultChanged() does not
kmadhusu
2014/06/13 17:42:13
It wasn't intentional. Updated the code to look th
| |
337 chrome::IsInstantExtendedAPIEnabled() && | |
338 chrome::ShouldPrefetchSearchResults()) { | |
339 InstantSuggestion prefetch_suggestion; | |
340 const AutocompleteResult& result = autocomplete_controller_->result(); | |
341 // If the default match should be prefetched, do that. | |
342 const AutocompleteResult::const_iterator default_match( | |
343 result.default_match()); | |
344 if ((default_match != result.end()) && | |
345 SearchProvider::ShouldPrefetch(*default_match)) { | |
346 prefetch_suggestion.text = default_match->contents; | |
347 prefetch_suggestion.metadata = | |
348 SearchProvider::GetSuggestMetadata(*default_match); | |
349 } | |
350 // Send the prefetch suggestion unconditionally to the Instant search base | |
351 // page. If there is no suggestion to prefetch, we need to send a blank | |
352 // query to clear the prefetched results. | |
353 InstantSearchPrerenderer* prerenderer = | |
354 InstantSearchPrerenderer::GetForProfile(profile_); | |
355 if (prerenderer) | |
356 prerenderer->Prerender(prefetch_suggestion); | |
357 } | |
332 if (autocomplete_controller_.get() != NULL && !inside_synchronous_start_) | 358 if (autocomplete_controller_.get() != NULL && !inside_synchronous_start_) |
333 NotifySuggestionsReceived(autocomplete_controller_->result()); | 359 NotifySuggestionsReceived(autocomplete_controller_->result()); |
334 } | 360 } |
335 | 361 |
336 void AutocompleteControllerAndroid::NotifySuggestionsReceived( | 362 void AutocompleteControllerAndroid::NotifySuggestionsReceived( |
337 const AutocompleteResult& autocomplete_result) { | 363 const AutocompleteResult& autocomplete_result) { |
338 JNIEnv* env = AttachCurrentThread(); | 364 JNIEnv* env = AttachCurrentThread(); |
339 ScopedJavaLocalRef<jobject> java_bridge = | 365 ScopedJavaLocalRef<jobject> java_bridge = |
340 weak_java_autocomplete_controller_android_.get(env); | 366 weak_java_autocomplete_controller_android_.get(env); |
341 if (!java_bridge.obj()) | 367 if (!java_bridge.obj()) |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
527 return; | 553 return; |
528 | 554 |
529 // ZeroSuggestPrefetcher deletes itself after it's done prefetching. | 555 // ZeroSuggestPrefetcher deletes itself after it's done prefetching. |
530 new ZeroSuggestPrefetcher(profile); | 556 new ZeroSuggestPrefetcher(profile); |
531 } | 557 } |
532 | 558 |
533 // Register native methods | 559 // Register native methods |
534 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) { | 560 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) { |
535 return RegisterNativesImpl(env); | 561 return RegisterNativesImpl(env); |
536 } | 562 } |
OLD | NEW |