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

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

Issue 2216713002: Use BookmarkModelFactory::GetForBrowserContext everywhere (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks
Patch Set: Eliminate Profile::FromBrowserContext in some places Created 4 years, 4 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 } 522 }
523 523
524 ScopedJavaLocalRef<jstring> answer_contents = 524 ScopedJavaLocalRef<jstring> answer_contents =
525 ConvertUTF16ToJavaString(env, match.answer_contents); 525 ConvertUTF16ToJavaString(env, match.answer_contents);
526 ScopedJavaLocalRef<jstring> answer_type = 526 ScopedJavaLocalRef<jstring> answer_type =
527 ConvertUTF16ToJavaString(env, match.answer_type); 527 ConvertUTF16ToJavaString(env, match.answer_type);
528 ScopedJavaLocalRef<jstring> fill_into_edit = 528 ScopedJavaLocalRef<jstring> fill_into_edit =
529 ConvertUTF16ToJavaString(env, match.fill_into_edit); 529 ConvertUTF16ToJavaString(env, match.fill_into_edit);
530 ScopedJavaLocalRef<jstring> destination_url = 530 ScopedJavaLocalRef<jstring> destination_url =
531 ConvertUTF8ToJavaString(env, match.destination_url.spec()); 531 ConvertUTF8ToJavaString(env, match.destination_url.spec());
532 BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_); 532 BookmarkModel* bookmark_model =
533 BookmarkModelFactory::GetForBrowserContext(profile_);
533 return Java_AutocompleteController_buildOmniboxSuggestion( 534 return Java_AutocompleteController_buildOmniboxSuggestion(
534 env, 535 env,
535 match.type, 536 match.type,
536 AutocompleteMatch::IsSearchType(match.type), 537 AutocompleteMatch::IsSearchType(match.type),
537 match.relevance, 538 match.relevance,
538 match.transition, 539 match.transition,
539 jcontents.obj(), 540 jcontents.obj(),
540 ToJavaIntArray(env, contents_class_offsets).obj(), 541 ToJavaIntArray(env, contents_class_offsets).obj(),
541 ToJavaIntArray(env, contents_class_styles).obj(), 542 ToJavaIntArray(env, contents_class_styles).obj(),
542 description.obj(), 543 description.obj(),
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 return; 631 return;
631 632
632 // ZeroSuggestPrefetcher deletes itself after it's done prefetching. 633 // ZeroSuggestPrefetcher deletes itself after it's done prefetching.
633 new ZeroSuggestPrefetcher(profile); 634 new ZeroSuggestPrefetcher(profile);
634 } 635 }
635 636
636 // Register native methods 637 // Register native methods
637 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) { 638 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) {
638 return RegisterNativesImpl(env); 639 return RegisterNativesImpl(env);
639 } 640 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698