OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/views/omnibox/omnibox_view_views.h" | 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
11 #include "chrome/browser/autocomplete/autocomplete_edit.h" | 11 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
12 #include "chrome/browser/autocomplete/autocomplete_match.h" | 12 #include "chrome/browser/autocomplete/autocomplete_match.h" |
13 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" | 13 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" |
14 #include "chrome/browser/command_updater.h" | 14 #include "chrome/browser/command_updater.h" |
15 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 15 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
16 #include "chrome/common/chrome_notification_types.h" | 16 #include "chrome/common/chrome_notification_types.h" |
17 #include "content/browser/tab_contents/tab_contents.h" | 17 #include "content/browser/tab_contents/tab_contents.h" |
18 #include "googleurl/src/gurl.h" | 18 #include "googleurl/src/gurl.h" |
19 #include "grit/generated_resources.h" | 19 #include "grit/generated_resources.h" |
20 #include "net/base/escape.h" | 20 #include "net/base/escape.h" |
21 #include "third_party/skia/include/core/SkColor.h" | 21 #include "third_party/skia/include/core/SkColor.h" |
22 #include "ui/base/accessibility/accessible_view_state.h" | 22 #include "ui/base/accessibility/accessible_view_state.h" |
23 #include "ui/base/dragdrop/drag_drop_types.h" | 23 #include "ui/base/dragdrop/drag_drop_types.h" |
24 #include "ui/base/ime/text_input_type.h" | 24 #include "ui/base/ime/text_input_type.h" |
25 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
26 #include "ui/base/resource/resource_bundle.h" | 26 #include "ui/base/resource/resource_bundle.h" |
27 #include "ui/gfx/font.h" | 27 #include "ui/gfx/font.h" |
28 #include "ui/gfx/render_text.h" | 28 #include "ui/gfx/render_text.h" |
| 29 #include "ui/views/events/event.h" |
| 30 #include "ui/views/layout/fill_layout.h" |
29 #include "views/border.h" | 31 #include "views/border.h" |
30 #include "views/controls/textfield/textfield.h" | 32 #include "views/controls/textfield/textfield.h" |
31 #include "views/events/event.h" | |
32 #include "views/layout/fill_layout.h" | |
33 | 33 |
34 #if defined(TOUCH_UI) | 34 #if defined(TOUCH_UI) |
35 #include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents
_view.h" | 35 #include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents
_view.h" |
36 #else | 36 #else |
37 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.
h" | 37 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.
h" |
38 #endif | 38 #endif |
39 | 39 |
40 #if defined(OS_WIN) | 40 #if defined(OS_WIN) |
41 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" | 41 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" |
42 #endif | 42 #endif |
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
752 OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller, | 752 OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller, |
753 toolbar_model, | 753 toolbar_model, |
754 profile, | 754 profile, |
755 command_updater, | 755 command_updater, |
756 popup_window_mode, | 756 popup_window_mode, |
757 location_bar); | 757 location_bar); |
758 omnibox_view->Init(); | 758 omnibox_view->Init(); |
759 return omnibox_view; | 759 return omnibox_view; |
760 } | 760 } |
761 #endif | 761 #endif |
OLD | NEW |