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

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

Issue 12377065: Consolidate VIEW_ID_LOCATION_BAR into VIEW_ID_OMNIBOX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 case VIEW_ID_RELOAD_BUTTON: 74 case VIEW_ID_RELOAD_BUTTON:
75 return "chrome-toolbar-reload-button"; 75 return "chrome-toolbar-reload-button";
76 76
77 case VIEW_ID_HOME_BUTTON: 77 case VIEW_ID_HOME_BUTTON:
78 return "chrome-toolbar-home-button"; 78 return "chrome-toolbar-home-button";
79 79
80 case VIEW_ID_STAR_BUTTON: 80 case VIEW_ID_STAR_BUTTON:
81 return "chrome-toolbar-star-button"; 81 return "chrome-toolbar-star-button";
82 82
83 case VIEW_ID_LOCATION_BAR:
84 return "chrome-location-bar";
85
86 case VIEW_ID_ACTION_BOX_BUTTON: 83 case VIEW_ID_ACTION_BOX_BUTTON:
87 return "chrome-action-box-button"; 84 return "chrome-action-box-button";
88 85
89 case VIEW_ID_BROWSER_ACTION_TOOLBAR: 86 case VIEW_ID_BROWSER_ACTION_TOOLBAR:
90 return "chrome-toolbar-browser-actions-container"; 87 return "chrome-toolbar-browser-actions-container";
91 88
92 case VIEW_ID_OMNIBOX: 89 case VIEW_ID_OMNIBOX:
93 return "chrome-omnibox"; 90 return "chrome-omnibox";
94 91
95 case VIEW_ID_APP_MENU: 92 case VIEW_ID_APP_MENU:
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 135
139 GtkWidget* ViewIDUtil::GetWidget(GtkWidget* root, ViewID id) { 136 GtkWidget* ViewIDUtil::GetWidget(GtkWidget* root, ViewID id) {
140 ViewIDSearchStruct search_struct = { id, NULL }; 137 ViewIDSearchStruct search_struct = { id, NULL };
141 SearchForWidgetWithViewID(root, &search_struct); 138 SearchForWidgetWithViewID(root, &search_struct);
142 return search_struct.widget; 139 return search_struct.widget;
143 } 140 }
144 141
145 void ViewIDUtil::SetDelegateForWidget(GtkWidget* widget, Delegate* delegate) { 142 void ViewIDUtil::SetDelegateForWidget(GtkWidget* widget, Delegate* delegate) {
146 g_object_set_data(G_OBJECT(widget), kViewIDOverrideString, delegate); 143 g_object_set_data(G_OBJECT(widget), kViewIDOverrideString, delegate);
147 } 144 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/view_id_util_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698