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

Side by Side Diff: chrome/browser/ui/gtk/browser_toolbar_gtk.h

Issue 9447096: gtk: Rename GtkThemeService to ThemeServiceGtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « chrome/browser/ui/gtk/browser_titlebar.cc ('k') | chrome/browser/ui/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 #include <string> 10 #include <string>
11 11
(...skipping 10 matching lines...) Expand all
22 #include "ui/base/gtk/gtk_signal.h" 22 #include "ui/base/gtk/gtk_signal.h"
23 #include "ui/base/gtk/gtk_signal_registrar.h" 23 #include "ui/base/gtk/gtk_signal_registrar.h"
24 #include "ui/base/gtk/owned_widget_gtk.h" 24 #include "ui/base/gtk/owned_widget_gtk.h"
25 #include "ui/base/models/simple_menu_model.h" 25 #include "ui/base/models/simple_menu_model.h"
26 26
27 class BackForwardButtonGtk; 27 class BackForwardButtonGtk;
28 class Browser; 28 class Browser;
29 class BrowserActionsToolbarGtk; 29 class BrowserActionsToolbarGtk;
30 class BrowserWindowGtk; 30 class BrowserWindowGtk;
31 class CustomDrawButton; 31 class CustomDrawButton;
32 class GtkThemeService; 32 class ThemeServiceGtk;
33 class LocationBar; 33 class LocationBar;
34 class LocationBarViewGtk; 34 class LocationBarViewGtk;
35 class ReloadButtonGtk; 35 class ReloadButtonGtk;
36 class ToolbarModel; 36 class ToolbarModel;
37 37
38 namespace content { 38 namespace content {
39 class WebContents; 39 class WebContents;
40 } 40 }
41 41
42 // View class that displays the GTK version of the toolbar and routes gtk 42 // View class that displays the GTK version of the toolbar and routes gtk
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 scoped_ptr<ReloadButtonGtk> reload_; 184 scoped_ptr<ReloadButtonGtk> reload_;
185 scoped_ptr<BrowserActionsToolbarGtk> actions_toolbar_; 185 scoped_ptr<BrowserActionsToolbarGtk> actions_toolbar_;
186 scoped_ptr<CustomDrawButton> wrench_menu_button_; 186 scoped_ptr<CustomDrawButton> wrench_menu_button_;
187 187
188 // The image shown in GTK+ mode in the wrench button. 188 // The image shown in GTK+ mode in the wrench button.
189 GtkWidget* wrench_menu_image_; 189 GtkWidget* wrench_menu_image_;
190 190
191 // The model that contains the security level, text, icon to display... 191 // The model that contains the security level, text, icon to display...
192 ToolbarModel* model_; 192 ToolbarModel* model_;
193 193
194 GtkThemeService* theme_service_; 194 ThemeServiceGtk* theme_service_;
195 195
196 scoped_ptr<MenuGtk> wrench_menu_; 196 scoped_ptr<MenuGtk> wrench_menu_;
197 197
198 scoped_ptr<WrenchMenuModel> wrench_menu_model_; 198 scoped_ptr<WrenchMenuModel> wrench_menu_model_;
199 199
200 // Flag to invalidate the wrench menu model. 200 // Flag to invalidate the wrench menu model.
201 bool is_wrench_menu_model_valid_; 201 bool is_wrench_menu_model_valid_;
202 202
203 Browser* browser_; 203 Browser* browser_;
204 BrowserWindowGtk* window_; 204 BrowserWindowGtk* window_;
(...skipping 11 matching lines...) Expand all
216 // rendering. 216 // rendering.
217 ui::OwnedWidgetGtk offscreen_entry_; 217 ui::OwnedWidgetGtk offscreen_entry_;
218 218
219 // Manages the home button drop signal handler. 219 // Manages the home button drop signal handler.
220 scoped_ptr<ui::GtkSignalRegistrar> drop_handler_; 220 scoped_ptr<ui::GtkSignalRegistrar> drop_handler_;
221 221
222 DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk); 222 DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk);
223 }; 223 };
224 224
225 #endif // CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_ 225 #endif // CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_titlebar.cc ('k') | chrome/browser/ui/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698