| 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 #if defined(ENABLE_EXTENSIONS) | 66 #if defined(ENABLE_EXTENSIONS) | 
| 68 #include "chrome/browser/ui/extensions/settings_api_bubble_helpers.h" | 67 #include "chrome/browser/ui/extensions/settings_api_bubble_helpers.h" | 
| 69 #endif | 68 #endif | 
| (...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1084     menu_contents->InsertItemWithStringIdAt( | 1083     menu_contents->InsertItemWithStringIdAt( | 
| 1085         select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); | 1084         select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); | 
| 1086   } | 1085   } | 
| 1087 | 1086 | 
| 1088   // Minor note: We use IDC_ for command id here while the underlying textfield | 1087   // Minor note: We use IDC_ for command id here while the underlying textfield | 
| 1089   // is using IDS_ for all its command ids. This is because views cannot depend | 1088   // is using IDS_ for all its command ids. This is because views cannot depend | 
| 1090   // on IDC_ for now. | 1089   // on IDC_ for now. | 
| 1091   menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, | 1090   menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, | 
| 1092       IDS_EDIT_SEARCH_ENGINES); | 1091       IDS_EDIT_SEARCH_ENGINES); | 
| 1093 } | 1092 } | 
| OLD | NEW | 
|---|