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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 #include "ui/base/models/simple_menu_model.h" | 49 #include "ui/base/models/simple_menu_model.h" |
50 #include "ui/compositor/layer.h" | 50 #include "ui/compositor/layer.h" |
51 #include "ui/events/event.h" | 51 #include "ui/events/event.h" |
52 #include "ui/gfx/canvas.h" | 52 #include "ui/gfx/canvas.h" |
53 #include "ui/gfx/font_list.h" | 53 #include "ui/gfx/font_list.h" |
54 #include "ui/gfx/selection_model.h" | 54 #include "ui/gfx/selection_model.h" |
55 #include "ui/strings/grit/ui_strings.h" | 55 #include "ui/strings/grit/ui_strings.h" |
56 #include "ui/views/border.h" | 56 #include "ui/views/border.h" |
57 #include "ui/views/button_drag_utils.h" | 57 #include "ui/views/button_drag_utils.h" |
58 #include "ui/views/controls/textfield/textfield.h" | 58 #include "ui/views/controls/textfield/textfield.h" |
59 #include "ui/views/layout/fill_layout.h" | |
60 #include "ui/views/widget/widget.h" | 59 #include "ui/views/widget/widget.h" |
61 #include "url/gurl.h" | 60 #include "url/gurl.h" |
62 | 61 |
63 #if defined(OS_WIN) | 62 #if defined(OS_WIN) |
64 #include "chrome/browser/browser_process.h" | 63 #include "chrome/browser/browser_process.h" |
65 #endif | 64 #endif |
66 | 65 |
67 using bookmarks::BookmarkNodeData; | 66 using bookmarks::BookmarkNodeData; |
68 | 67 |
69 namespace { | 68 namespace { |
(...skipping 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1075 menu_contents->InsertItemWithStringIdAt( | 1074 menu_contents->InsertItemWithStringIdAt( |
1076 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); | 1075 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); |
1077 } | 1076 } |
1078 | 1077 |
1079 // Minor note: We use IDC_ for command id here while the underlying textfield | 1078 // Minor note: We use IDC_ for command id here while the underlying textfield |
1080 // is using IDS_ for all its command ids. This is because views cannot depend | 1079 // is using IDS_ for all its command ids. This is because views cannot depend |
1081 // on IDC_ for now. | 1080 // on IDC_ for now. |
1082 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, | 1081 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, |
1083 IDS_EDIT_SEARCH_ENGINES); | 1082 IDS_EDIT_SEARCH_ENGINES); |
1084 } | 1083 } |
OLD | NEW |