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

Side by Side Diff: chrome/browser/ui/gtk/view_id_util.cc

Issue 12299003: Merge AutocompleteTextfield views::Textfield subclass into OmniboxView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove VIEW_ID_AUTOCOMPLETE in favor of VIEW_ID_OMNIBOX. Created 7 years, 10 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 | Annotate | Revision Log
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/gtk/view_id_util.h" 5 #include "chrome/browser/ui/gtk/view_id_util.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string> 8 #include <string>
9 9
10 #include <gtk/gtk.h> 10 #include <gtk/gtk.h>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 case VIEW_ID_LOCATION_BAR: 83 case VIEW_ID_LOCATION_BAR:
84 return "chrome-location-bar"; 84 return "chrome-location-bar";
85 85
86 case VIEW_ID_ACTION_BOX_BUTTON: 86 case VIEW_ID_ACTION_BOX_BUTTON:
87 return "chrome-action-box-button"; 87 return "chrome-action-box-button";
88 88
89 case VIEW_ID_BROWSER_ACTION_TOOLBAR: 89 case VIEW_ID_BROWSER_ACTION_TOOLBAR:
90 return "chrome-toolbar-browser-actions-container"; 90 return "chrome-toolbar-browser-actions-container";
91 91
92 case VIEW_ID_OMNIBOX:
93 return "chrome-omnibox";
94
92 case VIEW_ID_APP_MENU: 95 case VIEW_ID_APP_MENU:
93 return "chrome-app-menu"; 96 return "chrome-app-menu";
94 97
95 case VIEW_ID_AUTOCOMPLETE:
96 return "chrome-autocomplete-edit";
97
98 case VIEW_ID_BOOKMARK_BAR: 98 case VIEW_ID_BOOKMARK_BAR:
99 return "chrome-bookmark-bar"; 99 return "chrome-bookmark-bar";
100 100
101 case VIEW_ID_OTHER_BOOKMARKS: 101 case VIEW_ID_OTHER_BOOKMARKS:
102 return "chrome-bookmark-bar-other-bookmarks"; 102 return "chrome-bookmark-bar-other-bookmarks";
103 103
104 case VIEW_ID_FIND_IN_PAGE_TEXT_FIELD: 104 case VIEW_ID_FIND_IN_PAGE_TEXT_FIELD:
105 return "chrome-find-in-page-entry"; 105 return "chrome-find-in-page-entry";
106 106
107 case VIEW_ID_FIND_IN_PAGE: 107 case VIEW_ID_FIND_IN_PAGE:
(...skipping 30 matching lines...) Expand all
138 138
139 GtkWidget* ViewIDUtil::GetWidget(GtkWidget* root, ViewID id) { 139 GtkWidget* ViewIDUtil::GetWidget(GtkWidget* root, ViewID id) {
140 ViewIDSearchStruct search_struct = { id, NULL }; 140 ViewIDSearchStruct search_struct = { id, NULL };
141 SearchForWidgetWithViewID(root, &search_struct); 141 SearchForWidgetWithViewID(root, &search_struct);
142 return search_struct.widget; 142 return search_struct.widget;
143 } 143 }
144 144
145 void ViewIDUtil::SetDelegateForWidget(GtkWidget* widget, Delegate* delegate) { 145 void ViewIDUtil::SetDelegateForWidget(GtkWidget* widget, Delegate* delegate) {
146 g_object_set_data(G_OBJECT(widget), kViewIDOverrideString, delegate); 146 g_object_set_data(G_OBJECT(widget), kViewIDOverrideString, delegate);
147 } 147 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698