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

Side by Side Diff: chrome/browser/ui/omnibox/chrome_omnibox_client.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui/omnibox/chrome_omnibox_client.h" 5 #include "chrome/browser/ui/omnibox/chrome_omnibox_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
15 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.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/bitmap_fetcher/bitmap_fetcher_service_factory.h" 17 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h"
19 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 18 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
20 #include "chrome/browser/bookmarks/bookmark_stats.h" 19 #include "chrome/browser/bookmarks/bookmark_stats.h"
21 #include "chrome/browser/command_updater.h" 20 #include "chrome/browser/command_updater.h"
22 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" 21 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
23 #include "chrome/browser/net/predictor.h" 22 #include "chrome/browser/net/predictor.h"
(...skipping 10 matching lines...) Expand all
34 #include "chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h" 33 #include "chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h"
35 #include "chrome/browser/ui/search/instant_search_prerenderer.h" 34 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
36 #include "chrome/browser/ui/search/search_tab_helper.h" 35 #include "chrome/browser/ui/search/search_tab_helper.h"
37 #include "chrome/common/instant_types.h" 36 #include "chrome/common/instant_types.h"
38 #include "chrome/common/pref_names.h" 37 #include "chrome/common/pref_names.h"
39 #include "chrome/common/url_constants.h" 38 #include "chrome/common/url_constants.h"
40 #include "components/favicon/content/content_favicon_driver.h" 39 #include "components/favicon/content/content_favicon_driver.h"
41 #include "components/omnibox/browser/autocomplete_match.h" 40 #include "components/omnibox/browser/autocomplete_match.h"
42 #include "components/omnibox/browser/autocomplete_result.h" 41 #include "components/omnibox/browser/autocomplete_result.h"
43 #include "components/omnibox/browser/search_provider.h" 42 #include "components/omnibox/browser/search_provider.h"
43 #include "components/prefs/pref_service.h"
44 #include "components/search/search.h" 44 #include "components/search/search.h"
45 #include "components/search_engines/template_url_service.h" 45 #include "components/search_engines/template_url_service.h"
46 #include "content/public/browser/navigation_controller.h" 46 #include "content/public/browser/navigation_controller.h"
47 #include "content/public/browser/navigation_entry.h" 47 #include "content/public/browser/navigation_entry.h"
48 #include "content/public/browser/web_contents.h" 48 #include "content/public/browser/web_contents.h"
49 #include "extensions/common/constants.h" 49 #include "extensions/common/constants.h"
50 #include "ui/base/window_open_disposition.h" 50 #include "ui/base/window_open_disposition.h"
51 #include "url/gurl.h" 51 #include "url/gurl.h"
52 52
53 using predictors::AutocompleteActionPredictor; 53 using predictors::AutocompleteActionPredictor;
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 if (prerenderer) 469 if (prerenderer)
470 prerenderer->Prerender(suggestion); 470 prerenderer->Prerender(suggestion);
471 } 471 }
472 } 472 }
473 473
474 void ChromeOmniboxClient::OnBitmapFetched(const BitmapFetchedCallback& callback, 474 void ChromeOmniboxClient::OnBitmapFetched(const BitmapFetchedCallback& callback,
475 const SkBitmap& bitmap) { 475 const SkBitmap& bitmap) {
476 request_id_ = BitmapFetcherService::REQUEST_ID_INVALID; 476 request_id_ = BitmapFetcherService::REQUEST_ID_INVALID;
477 callback.Run(bitmap); 477 callback.Run(bitmap);
478 } 478 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/network_profile_bubble.cc ('k') | chrome/browser/ui/panels/panel_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698