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

Side by Side Diff: chrome/browser/android/omnibox/autocomplete_controller_android.cc

Issue 858173004: Delete GetTopAsynchronousMatch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « chrome/browser/android/omnibox/autocomplete_controller_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 return ScopedJavaLocalRef<jstring>(); 259 return ScopedJavaLocalRef<jstring>();
260 260
261 AutocompleteMatch match( 261 AutocompleteMatch match(
262 autocomplete_controller_->result().match_at(selected_index)); 262 autocomplete_controller_->result().match_at(selected_index));
263 autocomplete_controller_->UpdateMatchDestinationURLWithQueryFormulationTime( 263 autocomplete_controller_->UpdateMatchDestinationURLWithQueryFormulationTime(
264 base::TimeDelta::FromMilliseconds(elapsed_time_since_input_change), 264 base::TimeDelta::FromMilliseconds(elapsed_time_since_input_change),
265 &match); 265 &match);
266 return ConvertUTF8ToJavaString(env, match.destination_url.spec()); 266 return ConvertUTF8ToJavaString(env, match.destination_url.spec());
267 } 267 }
268 268
269 ScopedJavaLocalRef<jobject>
270 AutocompleteControllerAndroid::GetTopSynchronousMatch(JNIEnv* env,
271 jobject obj,
272 jstring query) {
273 return GetTopSynchronousResult(env, obj, query, false);
274 }
275
276 void AutocompleteControllerAndroid::Shutdown() { 269 void AutocompleteControllerAndroid::Shutdown() {
277 autocomplete_controller_.reset(); 270 autocomplete_controller_.reset();
278 271
279 JNIEnv* env = AttachCurrentThread(); 272 JNIEnv* env = AttachCurrentThread();
280 ScopedJavaLocalRef<jobject> java_bridge = 273 ScopedJavaLocalRef<jobject> java_bridge =
281 weak_java_autocomplete_controller_android_.get(env); 274 weak_java_autocomplete_controller_android_.get(env);
282 if (java_bridge.obj()) 275 if (java_bridge.obj())
283 Java_AutocompleteController_notifyNativeDestroyed(env, java_bridge.obj()); 276 Java_AutocompleteController_notifyNativeDestroyed(env, java_bridge.obj());
284 277
285 weak_java_autocomplete_controller_android_.reset(); 278 weak_java_autocomplete_controller_android_.reset();
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 return; 549 return;
557 550
558 // ZeroSuggestPrefetcher deletes itself after it's done prefetching. 551 // ZeroSuggestPrefetcher deletes itself after it's done prefetching.
559 new ZeroSuggestPrefetcher(profile); 552 new ZeroSuggestPrefetcher(profile);
560 } 553 }
561 554
562 // Register native methods 555 // Register native methods
563 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) { 556 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) {
564 return RegisterNativesImpl(env); 557 return RegisterNativesImpl(env);
565 } 558 }
OLDNEW
« no previous file with comments | « chrome/browser/android/omnibox/autocomplete_controller_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698