| 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 19 matching lines...) Expand all Loading... |
| 30 #include "components/omnibox/browser/omnibox_edit_model.h" | 30 #include "components/omnibox/browser/omnibox_edit_model.h" |
| 31 #include "components/omnibox/browser/omnibox_field_trial.h" | 31 #include "components/omnibox/browser/omnibox_field_trial.h" |
| 32 #include "components/omnibox/browser/omnibox_popup_model.h" | 32 #include "components/omnibox/browser/omnibox_popup_model.h" |
| 33 #include "components/search/search.h" | 33 #include "components/search/search.h" |
| 34 #include "components/toolbar/toolbar_model.h" | 34 #include "components/toolbar/toolbar_model.h" |
| 35 #include "content/public/browser/web_contents.h" | 35 #include "content/public/browser/web_contents.h" |
| 36 #include "extensions/common/constants.h" | 36 #include "extensions/common/constants.h" |
| 37 #include "grit/components_strings.h" | 37 #include "grit/components_strings.h" |
| 38 #include "net/base/escape.h" | 38 #include "net/base/escape.h" |
| 39 #include "third_party/skia/include/core/SkColor.h" | 39 #include "third_party/skia/include/core/SkColor.h" |
| 40 #include "ui/accessibility/ax_enums.h" |
| 40 #include "ui/accessibility/ax_view_state.h" | 41 #include "ui/accessibility/ax_view_state.h" |
| 41 #include "ui/base/clipboard/scoped_clipboard_writer.h" | 42 #include "ui/base/clipboard/scoped_clipboard_writer.h" |
| 42 #include "ui/base/dragdrop/drag_drop_types.h" | 43 #include "ui/base/dragdrop/drag_drop_types.h" |
| 43 #include "ui/base/dragdrop/os_exchange_data.h" | 44 #include "ui/base/dragdrop/os_exchange_data.h" |
| 44 #include "ui/base/ime/input_method.h" | 45 #include "ui/base/ime/input_method.h" |
| 45 #include "ui/base/ime/text_input_client.h" | 46 #include "ui/base/ime/text_input_client.h" |
| 46 #include "ui/base/ime/text_input_type.h" | 47 #include "ui/base/ime/text_input_type.h" |
| 47 #include "ui/base/l10n/l10n_util.h" | 48 #include "ui/base/l10n/l10n_util.h" |
| 48 #include "ui/base/material_design/material_design_controller.h" | 49 #include "ui/base/material_design/material_design_controller.h" |
| 49 #include "ui/base/models/simple_menu_model.h" | 50 #include "ui/base/models/simple_menu_model.h" |
| (...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1072 menu_contents->InsertItemWithStringIdAt( | 1073 menu_contents->InsertItemWithStringIdAt( |
| 1073 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); | 1074 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); |
| 1074 } | 1075 } |
| 1075 | 1076 |
| 1076 // Minor note: We use IDC_ for command id here while the underlying textfield | 1077 // Minor note: We use IDC_ for command id here while the underlying textfield |
| 1077 // is using IDS_ for all its command ids. This is because views cannot depend | 1078 // is using IDS_ for all its command ids. This is because views cannot depend |
| 1078 // on IDC_ for now. | 1079 // on IDC_ for now. |
| 1079 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, | 1080 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, |
| 1080 IDS_EDIT_SEARCH_ENGINES); | 1081 IDS_EDIT_SEARCH_ENGINES); |
| 1081 } | 1082 } |
| OLD | NEW |