Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 1159033008: Refactor ViewsDelegate singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "ui/events/event.h" 43 #include "ui/events/event.h"
44 #include "ui/gfx/canvas.h" 44 #include "ui/gfx/canvas.h"
45 #include "ui/gfx/font_list.h" 45 #include "ui/gfx/font_list.h"
46 #include "ui/gfx/selection_model.h" 46 #include "ui/gfx/selection_model.h"
47 #include "ui/strings/grit/ui_strings.h" 47 #include "ui/strings/grit/ui_strings.h"
48 #include "ui/views/border.h" 48 #include "ui/views/border.h"
49 #include "ui/views/button_drag_utils.h" 49 #include "ui/views/button_drag_utils.h"
50 #include "ui/views/controls/textfield/textfield.h" 50 #include "ui/views/controls/textfield/textfield.h"
51 #include "ui/views/ime/input_method.h" 51 #include "ui/views/ime/input_method.h"
52 #include "ui/views/layout/fill_layout.h" 52 #include "ui/views/layout/fill_layout.h"
53 #include "ui/views/views_delegate.h"
54 #include "ui/views/widget/widget.h" 53 #include "ui/views/widget/widget.h"
55 #include "url/gurl.h" 54 #include "url/gurl.h"
56 55
57 #if defined(OS_WIN) 56 #if defined(OS_WIN)
58 #include "chrome/browser/browser_process.h" 57 #include "chrome/browser/browser_process.h"
59 #endif 58 #endif
60 59
61 using bookmarks::BookmarkNodeData; 60 using bookmarks::BookmarkNodeData;
62 61
63 namespace { 62 namespace {
(...skipping 992 matching lines...) Expand 10 before | Expand all | Expand 10 after
1056 menu_contents->InsertItemWithStringIdAt( 1055 menu_contents->InsertItemWithStringIdAt(
1057 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); 1056 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL);
1058 } 1057 }
1059 1058
1060 // Minor note: We use IDC_ for command id here while the underlying textfield 1059 // Minor note: We use IDC_ for command id here while the underlying textfield
1061 // is using IDS_ for all its command ids. This is because views cannot depend 1060 // is using IDS_ for all its command ids. This is because views cannot depend
1062 // on IDC_ for now. 1061 // on IDC_ for now.
1063 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, 1062 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
1064 IDS_EDIT_SEARCH_ENGINES); 1063 IDS_EDIT_SEARCH_ENGINES);
1065 } 1064 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698