| 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 12 matching lines...) Expand all Loading... |
| 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/browser/ui/views/settings_api_bubble_helper_views.h" | 24 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h" |
| 25 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" | 25 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" |
| 26 #include "chrome/grit/generated_resources.h" | 26 #include "chrome/grit/generated_resources.h" |
| 27 #include "components/bookmarks/browser/bookmark_node_data.h" | 27 #include "components/bookmarks/browser/bookmark_node_data.h" |
| 28 #include "components/omnibox/autocomplete_input.h" | 28 #include "components/omnibox/autocomplete_input.h" |
| 29 #include "components/omnibox/autocomplete_match.h" | 29 #include "components/omnibox/autocomplete_match.h" |
| 30 #include "components/omnibox/omnibox_field_trial.h" | 30 #include "components/omnibox/omnibox_field_trial.h" |
| 31 #include "content/public/browser/web_contents.h" | 31 #include "content/public/browser/web_contents.h" |
| 32 #include "extensions/common/constants.h" | 32 #include "extensions/common/constants.h" |
| 33 #include "grit/app_locale_settings.h" | |
| 34 #include "net/base/escape.h" | 33 #include "net/base/escape.h" |
| 35 #include "third_party/skia/include/core/SkColor.h" | 34 #include "third_party/skia/include/core/SkColor.h" |
| 36 #include "ui/accessibility/ax_view_state.h" | 35 #include "ui/accessibility/ax_view_state.h" |
| 37 #include "ui/aura/client/focus_client.h" | 36 #include "ui/aura/client/focus_client.h" |
| 38 #include "ui/aura/window_event_dispatcher.h" | 37 #include "ui/aura/window_event_dispatcher.h" |
| 39 #include "ui/base/clipboard/scoped_clipboard_writer.h" | 38 #include "ui/base/clipboard/scoped_clipboard_writer.h" |
| 40 #include "ui/base/dragdrop/drag_drop_types.h" | 39 #include "ui/base/dragdrop/drag_drop_types.h" |
| 41 #include "ui/base/dragdrop/os_exchange_data.h" | 40 #include "ui/base/dragdrop/os_exchange_data.h" |
| 42 #include "ui/base/ime/text_input_client.h" | 41 #include "ui/base/ime/text_input_client.h" |
| 43 #include "ui/base/ime/text_input_type.h" | 42 #include "ui/base/ime/text_input_type.h" |
| (...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1039 menu_contents->InsertItemWithStringIdAt( | 1038 menu_contents->InsertItemWithStringIdAt( |
| 1040 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); | 1039 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); |
| 1041 } | 1040 } |
| 1042 | 1041 |
| 1043 // Minor note: We use IDC_ for command id here while the underlying textfield | 1042 // Minor note: We use IDC_ for command id here while the underlying textfield |
| 1044 // is using IDS_ for all its command ids. This is because views cannot depend | 1043 // is using IDS_ for all its command ids. This is because views cannot depend |
| 1045 // on IDC_ for now. | 1044 // on IDC_ for now. |
| 1046 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, | 1045 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, |
| 1047 IDS_EDIT_SEARCH_ENGINES); | 1046 IDS_EDIT_SEARCH_ENGINES); |
| 1048 } | 1047 } |
| OLD | NEW |