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 <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 #include "chrome/browser/ui/omnibox/omnibox_navigation_observer.h" | 47 #include "chrome/browser/ui/omnibox/omnibox_navigation_observer.h" |
48 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 48 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
49 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" | 49 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" |
50 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 50 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
51 #include "chrome/browser/ui/search/instant_search_prerenderer.h" | 51 #include "chrome/browser/ui/search/instant_search_prerenderer.h" |
52 #include "chrome/browser/ui/search/search_tab_helper.h" | 52 #include "chrome/browser/ui/search/search_tab_helper.h" |
53 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 53 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
54 #include "chrome/common/chrome_switches.h" | 54 #include "chrome/common/chrome_switches.h" |
55 #include "chrome/common/pref_names.h" | 55 #include "chrome/common/pref_names.h" |
56 #include "chrome/common/url_constants.h" | 56 #include "chrome/common/url_constants.h" |
57 #include "components/autocomplete/autocomplete_provider.h" | |
58 #include "components/bookmarks/browser/bookmark_model.h" | 57 #include "components/bookmarks/browser/bookmark_model.h" |
59 #include "components/google/core/browser/google_url_tracker.h" | 58 #include "components/google/core/browser/google_url_tracker.h" |
60 #include "components/metrics/proto/omnibox_event.pb.h" | 59 #include "components/metrics/proto/omnibox_event.pb.h" |
| 60 #include "components/omnibox/autocomplete_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" |
68 #include "content/public/browser/render_view_host.h" | 68 #include "content/public/browser/render_view_host.h" |
69 #include "content/public/browser/user_metrics.h" | 69 #include "content/public/browser/user_metrics.h" |
70 #include "extensions/common/constants.h" | 70 #include "extensions/common/constants.h" |
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1475 // Update state and notify view if the omnibox has focus and the caret | 1475 // Update state and notify view if the omnibox has focus and the caret |
1476 // visibility changed. | 1476 // visibility changed. |
1477 const bool was_caret_visible = is_caret_visible(); | 1477 const bool was_caret_visible = is_caret_visible(); |
1478 focus_state_ = state; | 1478 focus_state_ = state; |
1479 if (focus_state_ != OMNIBOX_FOCUS_NONE && | 1479 if (focus_state_ != OMNIBOX_FOCUS_NONE && |
1480 is_caret_visible() != was_caret_visible) | 1480 is_caret_visible() != was_caret_visible) |
1481 view_->ApplyCaretVisibility(); | 1481 view_->ApplyCaretVisibility(); |
1482 | 1482 |
1483 delegate_->OnFocusChanged(focus_state_, reason); | 1483 delegate_->OnFocusChanged(focus_state_, reason); |
1484 } | 1484 } |
OLD | NEW |