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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/prefs/pref_service.h"
12 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
13 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
14 #include "base/time/time.h" 13 #include "base/time/time.h"
15 #include "base/timer/timer.h" 14 #include "base/timer/timer.h"
16 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 15 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
17 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" 16 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
18 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 17 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
19 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" 18 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
20 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 19 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
21 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
(...skipping 14 matching lines...) Expand all
36 #include "components/metrics/proto/omnibox_event.pb.h" 35 #include "components/metrics/proto/omnibox_event.pb.h"
37 #include "components/omnibox/browser/autocomplete_classifier.h" 36 #include "components/omnibox/browser/autocomplete_classifier.h"
38 #include "components/omnibox/browser/autocomplete_controller.h" 37 #include "components/omnibox/browser/autocomplete_controller.h"
39 #include "components/omnibox/browser/autocomplete_input.h" 38 #include "components/omnibox/browser/autocomplete_input.h"
40 #include "components/omnibox/browser/autocomplete_match.h" 39 #include "components/omnibox/browser/autocomplete_match.h"
41 #include "components/omnibox/browser/autocomplete_match_type.h" 40 #include "components/omnibox/browser/autocomplete_match_type.h"
42 #include "components/omnibox/browser/omnibox_event_global_tracker.h" 41 #include "components/omnibox/browser/omnibox_event_global_tracker.h"
43 #include "components/omnibox/browser/omnibox_field_trial.h" 42 #include "components/omnibox/browser/omnibox_field_trial.h"
44 #include "components/omnibox/browser/omnibox_log.h" 43 #include "components/omnibox/browser/omnibox_log.h"
45 #include "components/omnibox/browser/search_provider.h" 44 #include "components/omnibox/browser/search_provider.h"
45 #include "components/prefs/pref_service.h"
46 #include "components/search/search.h" 46 #include "components/search/search.h"
47 #include "components/search_engines/template_url_service.h" 47 #include "components/search_engines/template_url_service.h"
48 #include "components/toolbar/toolbar_model.h" 48 #include "components/toolbar/toolbar_model.h"
49 #include "components/url_formatter/url_formatter.h" 49 #include "components/url_formatter/url_formatter.h"
50 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
51 #include "content/public/common/url_constants.h" 51 #include "content/public/common/url_constants.h"
52 #include "jni/AutocompleteController_jni.h" 52 #include "jni/AutocompleteController_jni.h"
53 #include "net/base/escape.h" 53 #include "net/base/escape.h"
54 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 54 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
55 55
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 return; 569 return;
570 570
571 // ZeroSuggestPrefetcher deletes itself after it's done prefetching. 571 // ZeroSuggestPrefetcher deletes itself after it's done prefetching.
572 new ZeroSuggestPrefetcher(profile); 572 new ZeroSuggestPrefetcher(profile);
573 } 573 }
574 574
575 // Register native methods 575 // Register native methods
576 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) { 576 bool RegisterAutocompleteControllerAndroid(JNIEnv* env) {
577 return RegisterNativesImpl(env); 577 return RegisterNativesImpl(env);
578 } 578 }
OLDNEW
« no previous file with comments | « chrome/browser/android/new_tab_page_prefs.cc ('k') | chrome/browser/android/password_ui_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698