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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/omnibox/omnibox_edit_model.cc

Issue 1191953004: Revert of Revert of Componentize HistoryURLProvider/ScoredHistoryMatch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prepare_history_url_provider_for_c14n
Patch Set: Created 5 years, 6 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/autocomplete/zero_suggest_provider.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/omnibox_edit_model.h" 5 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
11 #include "base/format_macros.h" 11 #include "base/format_macros.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/prefs/pref_service.h" 13 #include "base/prefs/pref_service.h"
14 #include "base/profiler/scoped_tracker.h" 14 #include "base/profiler/scoped_tracker.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "chrome/app/chrome_command_ids.h" 19 #include "chrome/app/chrome_command_ids.h"
20 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 20 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
21 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 21 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
22 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 22 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
23 #include "chrome/browser/autocomplete/history_url_provider.h"
24 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 23 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
25 #include "chrome/browser/bookmarks/bookmark_stats.h" 24 #include "chrome/browser/bookmarks/bookmark_stats.h"
26 #include "chrome/browser/chrome_notification_types.h" 25 #include "chrome/browser/chrome_notification_types.h"
27 #include "chrome/browser/command_updater.h" 26 #include "chrome/browser/command_updater.h"
28 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" 27 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
29 #include "chrome/browser/net/predictor.h" 28 #include "chrome/browser/net/predictor.h"
30 #include "chrome/browser/predictors/autocomplete_action_predictor.h" 29 #include "chrome/browser/predictors/autocomplete_action_predictor.h"
31 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" 30 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
32 #include "chrome/browser/prerender/prerender_field_trial.h" 31 #include "chrome/browser/prerender/prerender_field_trial.h"
33 #include "chrome/browser/prerender/prerender_manager.h" 32 #include "chrome/browser/prerender/prerender_manager.h"
(...skipping 14 matching lines...) Expand all
48 #include "chrome/browser/ui/search/search_tab_helper.h" 47 #include "chrome/browser/ui/search/search_tab_helper.h"
49 #include "chrome/browser/ui/toolbar/toolbar_model.h" 48 #include "chrome/browser/ui/toolbar/toolbar_model.h"
50 #include "chrome/common/chrome_switches.h" 49 #include "chrome/common/chrome_switches.h"
51 #include "chrome/common/pref_names.h" 50 #include "chrome/common/pref_names.h"
52 #include "chrome/common/url_constants.h" 51 #include "chrome/common/url_constants.h"
53 #include "components/bookmarks/browser/bookmark_model.h" 52 #include "components/bookmarks/browser/bookmark_model.h"
54 #include "components/favicon/content/content_favicon_driver.h" 53 #include "components/favicon/content/content_favicon_driver.h"
55 #include "components/metrics/proto/omnibox_event.pb.h" 54 #include "components/metrics/proto/omnibox_event.pb.h"
56 #include "components/omnibox/autocomplete_match_type.h" 55 #include "components/omnibox/autocomplete_match_type.h"
57 #include "components/omnibox/autocomplete_provider.h" 56 #include "components/omnibox/autocomplete_provider.h"
57 #include "components/omnibox/history_url_provider.h"
58 #include "components/omnibox/keyword_provider.h" 58 #include "components/omnibox/keyword_provider.h"
59 #include "components/omnibox/omnibox_log.h" 59 #include "components/omnibox/omnibox_log.h"
60 #include "components/omnibox/search_provider.h" 60 #include "components/omnibox/search_provider.h"
61 #include "components/search_engines/template_url.h" 61 #include "components/search_engines/template_url.h"
62 #include "components/search_engines/template_url_prepopulate_data.h" 62 #include "components/search_engines/template_url_prepopulate_data.h"
63 #include "components/search_engines/template_url_service.h" 63 #include "components/search_engines/template_url_service.h"
64 #include "components/url_fixer/url_fixer.h" 64 #include "components/url_fixer/url_fixer.h"
65 #include "content/public/browser/navigation_controller.h" 65 #include "content/public/browser/navigation_controller.h"
66 #include "content/public/browser/navigation_entry.h" 66 #include "content/public/browser/navigation_entry.h"
67 #include "content/public/browser/notification_service.h" 67 #include "content/public/browser/notification_service.h"
(...skipping 1468 matching lines...) Expand 10 before | Expand all | Expand 10 after
1536 // Update state and notify view if the omnibox has focus and the caret 1536 // Update state and notify view if the omnibox has focus and the caret
1537 // visibility changed. 1537 // visibility changed.
1538 const bool was_caret_visible = is_caret_visible(); 1538 const bool was_caret_visible = is_caret_visible();
1539 focus_state_ = state; 1539 focus_state_ = state;
1540 if (focus_state_ != OMNIBOX_FOCUS_NONE && 1540 if (focus_state_ != OMNIBOX_FOCUS_NONE &&
1541 is_caret_visible() != was_caret_visible) 1541 is_caret_visible() != was_caret_visible)
1542 view_->ApplyCaretVisibility(); 1542 view_->ApplyCaretVisibility();
1543 1543
1544 delegate_->OnFocusChanged(focus_state_, reason); 1544 delegate_->OnFocusChanged(focus_state_, reason);
1545 } 1545 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/zero_suggest_provider.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698