OLD | NEW |
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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/format_macros.h" | 10 #include "base/format_macros.h" |
11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
| 12 #include "base/prefs/pref_service.h" |
12 #include "base/string_util.h" | 13 #include "base/string_util.h" |
13 #include "base/stringprintf.h" | 14 #include "base/stringprintf.h" |
14 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
15 #include "chrome/app/chrome_command_ids.h" | 16 #include "chrome/app/chrome_command_ids.h" |
16 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 17 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
17 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 18 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
18 #include "chrome/browser/autocomplete/autocomplete_input.h" | 19 #include "chrome/browser/autocomplete/autocomplete_input.h" |
19 #include "chrome/browser/autocomplete/autocomplete_log.h" | 20 #include "chrome/browser/autocomplete/autocomplete_log.h" |
20 #include "chrome/browser/autocomplete/autocomplete_provider.h" | 21 #include "chrome/browser/autocomplete/autocomplete_provider.h" |
21 #include "chrome/browser/autocomplete/extension_app_provider.h" | 22 #include "chrome/browser/autocomplete/extension_app_provider.h" |
22 #include "chrome/browser/autocomplete/keyword_provider.h" | 23 #include "chrome/browser/autocomplete/keyword_provider.h" |
23 #include "chrome/browser/autocomplete/search_provider.h" | 24 #include "chrome/browser/autocomplete/search_provider.h" |
24 #include "chrome/browser/bookmarks/bookmark_utils.h" | 25 #include "chrome/browser/bookmarks/bookmark_utils.h" |
25 #include "chrome/browser/command_updater.h" | 26 #include "chrome/browser/command_updater.h" |
26 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" | 27 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" |
27 #include "chrome/browser/google/google_url_tracker.h" | 28 #include "chrome/browser/google/google_url_tracker.h" |
28 #include "chrome/browser/instant/instant_controller.h" | 29 #include "chrome/browser/instant/instant_controller.h" |
29 #include "chrome/browser/net/predictor.h" | 30 #include "chrome/browser/net/predictor.h" |
30 #include "chrome/browser/net/url_fixer_upper.h" | 31 #include "chrome/browser/net/url_fixer_upper.h" |
31 #include "chrome/browser/predictors/autocomplete_action_predictor.h" | 32 #include "chrome/browser/predictors/autocomplete_action_predictor.h" |
32 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" | 33 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" |
33 #include "chrome/browser/prefs/pref_service.h" | |
34 #include "chrome/browser/prerender/prerender_field_trial.h" | 34 #include "chrome/browser/prerender/prerender_field_trial.h" |
35 #include "chrome/browser/prerender/prerender_manager.h" | 35 #include "chrome/browser/prerender/prerender_manager.h" |
36 #include "chrome/browser/prerender/prerender_manager_factory.h" | 36 #include "chrome/browser/prerender/prerender_manager_factory.h" |
37 #include "chrome/browser/profiles/profile.h" | 37 #include "chrome/browser/profiles/profile.h" |
38 #include "chrome/browser/search_engines/template_url.h" | 38 #include "chrome/browser/search_engines/template_url.h" |
39 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 39 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
40 #include "chrome/browser/search_engines/template_url_service.h" | 40 #include "chrome/browser/search_engines/template_url_service.h" |
41 #include "chrome/browser/search_engines/template_url_service_factory.h" | 41 #include "chrome/browser/search_engines/template_url_service_factory.h" |
42 #include "chrome/browser/sessions/session_tab_helper.h" | 42 #include "chrome/browser/sessions/session_tab_helper.h" |
43 #include "chrome/browser/ui/browser_list.h" | 43 #include "chrome/browser/ui/browser_list.h" |
(...skipping 1297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1341 instant->OmniboxFocusChanged(state, reason, NULL); | 1341 instant->OmniboxFocusChanged(state, reason, NULL); |
1342 | 1342 |
1343 // Update state and notify view if the omnibox has focus and the caret | 1343 // Update state and notify view if the omnibox has focus and the caret |
1344 // visibility changed. | 1344 // visibility changed. |
1345 const bool was_caret_visible = is_caret_visible(); | 1345 const bool was_caret_visible = is_caret_visible(); |
1346 focus_state_ = state; | 1346 focus_state_ = state; |
1347 if (focus_state_ != OMNIBOX_FOCUS_NONE && | 1347 if (focus_state_ != OMNIBOX_FOCUS_NONE && |
1348 is_caret_visible() != was_caret_visible) | 1348 is_caret_visible() != was_caret_visible) |
1349 view_->ApplyCaretVisibility(); | 1349 view_->ApplyCaretVisibility(); |
1350 } | 1350 } |
OLD | NEW |