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

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: Replace in .mm files 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 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 } 524 }
525 525
526 ScopedJavaLocalRef<jstring> answer_contents = 526 ScopedJavaLocalRef<jstring> answer_contents =
527 ConvertUTF16ToJavaString(env, match.answer_contents); 527 ConvertUTF16ToJavaString(env, match.answer_contents);
528 ScopedJavaLocalRef<jstring> answer_type = 528 ScopedJavaLocalRef<jstring> answer_type =
529 ConvertUTF16ToJavaString(env, match.answer_type); 529 ConvertUTF16ToJavaString(env, match.answer_type);
530 ScopedJavaLocalRef<jstring> fill_into_edit = 530 ScopedJavaLocalRef<jstring> fill_into_edit =
531 ConvertUTF16ToJavaString(env, match.fill_into_edit); 531 ConvertUTF16ToJavaString(env, match.fill_into_edit);
532 ScopedJavaLocalRef<jstring> destination_url = 532 ScopedJavaLocalRef<jstring> destination_url =
533 ConvertUTF8ToJavaString(env, match.destination_url.spec()); 533 ConvertUTF8ToJavaString(env, match.destination_url.spec());
534 BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_); 534 BookmarkModel* bookmark_model =
535 BookmarkModelFactory::GetForBrowserContext(profile_);
535 return Java_AutocompleteController_buildOmniboxSuggestion( 536 return Java_AutocompleteController_buildOmniboxSuggestion(
536 env, 537 env,
537 match.type, 538 match.type,
538 AutocompleteMatch::IsSearchType(match.type), 539 AutocompleteMatch::IsSearchType(match.type),
539 match.relevance, 540 match.relevance,
540 match.transition, 541 match.transition,
541 jcontents.obj(), 542 jcontents.obj(),
542 ToJavaIntArray(env, contents_class_offsets).obj(), 543 ToJavaIntArray(env, contents_class_offsets).obj(),
543 ToJavaIntArray(env, contents_class_styles).obj(), 544 ToJavaIntArray(env, contents_class_styles).obj(),
544 description.obj(), 545 description.obj(),
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 return; 633 return;
633 634
634 // ZeroSuggestPrefetcher deletes itself after it's done prefetching. 635 // ZeroSuggestPrefetcher deletes itself after it's done prefetching.
635 new ZeroSuggestPrefetcher(profile); 636 new ZeroSuggestPrefetcher(profile);
636 } 637 }
637 638
638 // Register native methods 639 // Register native methods
639 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) { 640 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) {
640 return RegisterNativesImpl(env); 641 return RegisterNativesImpl(env);
641 } 642 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698