OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/views/omnibox/omnibox_view_views.h" | 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 22 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
23 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" | 23 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" |
24 #include "chrome/grit/generated_resources.h" | 24 #include "chrome/grit/generated_resources.h" |
25 #include "components/bookmarks/browser/bookmark_node_data.h" | 25 #include "components/bookmarks/browser/bookmark_node_data.h" |
26 #include "components/omnibox/browser/autocomplete_input.h" | 26 #include "components/omnibox/browser/autocomplete_input.h" |
27 #include "components/omnibox/browser/autocomplete_match.h" | 27 #include "components/omnibox/browser/autocomplete_match.h" |
28 #include "components/omnibox/browser/omnibox_edit_controller.h" | 28 #include "components/omnibox/browser/omnibox_edit_controller.h" |
29 #include "components/omnibox/browser/omnibox_edit_model.h" | 29 #include "components/omnibox/browser/omnibox_edit_model.h" |
30 #include "components/omnibox/browser/omnibox_field_trial.h" | 30 #include "components/omnibox/browser/omnibox_field_trial.h" |
31 #include "components/omnibox/browser/omnibox_popup_model.h" | 31 #include "components/omnibox/browser/omnibox_popup_model.h" |
| 32 #include "components/strings/grit/components_strings.h" |
32 #include "components/toolbar/toolbar_model.h" | 33 #include "components/toolbar/toolbar_model.h" |
33 #include "content/public/browser/web_contents.h" | 34 #include "content/public/browser/web_contents.h" |
34 #include "extensions/common/constants.h" | 35 #include "extensions/common/constants.h" |
35 #include "grit/components_strings.h" | |
36 #include "net/base/escape.h" | 36 #include "net/base/escape.h" |
37 #include "third_party/skia/include/core/SkColor.h" | 37 #include "third_party/skia/include/core/SkColor.h" |
38 #include "ui/accessibility/ax_view_state.h" | 38 #include "ui/accessibility/ax_view_state.h" |
39 #include "ui/base/clipboard/scoped_clipboard_writer.h" | 39 #include "ui/base/clipboard/scoped_clipboard_writer.h" |
40 #include "ui/base/dragdrop/drag_drop_types.h" | 40 #include "ui/base/dragdrop/drag_drop_types.h" |
41 #include "ui/base/dragdrop/os_exchange_data.h" | 41 #include "ui/base/dragdrop/os_exchange_data.h" |
42 #include "ui/base/ime/input_method.h" | 42 #include "ui/base/ime/input_method.h" |
43 #include "ui/base/ime/text_edit_commands.h" | 43 #include "ui/base/ime/text_edit_commands.h" |
44 #include "ui/base/ime/text_input_client.h" | 44 #include "ui/base/ime/text_input_client.h" |
45 #include "ui/base/ime/text_input_type.h" | 45 #include "ui/base/ime/text_input_type.h" |
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1090 paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO); | 1090 paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO); |
1091 | 1091 |
1092 menu_contents->AddSeparator(ui::NORMAL_SEPARATOR); | 1092 menu_contents->AddSeparator(ui::NORMAL_SEPARATOR); |
1093 | 1093 |
1094 // Minor note: We use IDC_ for command id here while the underlying textfield | 1094 // Minor note: We use IDC_ for command id here while the underlying textfield |
1095 // is using IDS_ for all its command ids. This is because views cannot depend | 1095 // is using IDS_ for all its command ids. This is because views cannot depend |
1096 // on IDC_ for now. | 1096 // on IDC_ for now. |
1097 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, | 1097 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, |
1098 IDS_EDIT_SEARCH_ENGINES); | 1098 IDS_EDIT_SEARCH_ENGINES); |
1099 } | 1099 } |
OLD | NEW |