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

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

Issue 10337010: Revert r123782. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 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 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 10 matching lines...) Expand all
21 #include "ui/base/animation/animation_delegate.h" 21 #include "ui/base/animation/animation_delegate.h"
22 #include "ui/base/animation/slide_animation.h" 22 #include "ui/base/animation/slide_animation.h"
23 #include "ui/base/gtk/gtk_signal.h" 23 #include "ui/base/gtk/gtk_signal.h"
24 #include "ui/base/gtk/gtk_signal_registrar.h" 24 #include "ui/base/gtk/gtk_signal_registrar.h"
25 #include "ui/base/gtk/owned_widget_gtk.h" 25 #include "ui/base/gtk/owned_widget_gtk.h"
26 #include "ui/base/models/simple_menu_model.h" 26 #include "ui/base/models/simple_menu_model.h"
27 27
28 class Browser; 28 class Browser;
29 class BrowserActionButton; 29 class BrowserActionButton;
30 class Extension; 30 class Extension;
31 class ThemeServiceGtk; 31 class GtkThemeService;
32 class Profile; 32 class Profile;
33 33
34 typedef struct _GdkDragContext GdkDragContext; 34 typedef struct _GdkDragContext GdkDragContext;
35 typedef struct _GtkWidget GtkWidget; 35 typedef struct _GtkWidget GtkWidget;
36 36
37 class BrowserActionsToolbarGtk : public ExtensionToolbarModel::Observer, 37 class BrowserActionsToolbarGtk : public ExtensionToolbarModel::Observer,
38 public ui::AnimationDelegate, 38 public ui::AnimationDelegate,
39 public MenuGtk::Delegate, 39 public MenuGtk::Delegate,
40 public ui::SimpleMenuModel::Delegate, 40 public ui::SimpleMenuModel::Delegate,
41 public content::NotificationObserver { 41 public content::NotificationObserver {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 CHROMEGTK_CALLBACK_1(BrowserActionsToolbarGtk, gboolean, 168 CHROMEGTK_CALLBACK_1(BrowserActionsToolbarGtk, gboolean,
169 OnOverflowButtonPress, GdkEventButton*); 169 OnOverflowButtonPress, GdkEventButton*);
170 // The user presses a mouse button over the popped up overflow menu. 170 // The user presses a mouse button over the popped up overflow menu.
171 CHROMEGTK_CALLBACK_1(BrowserActionsToolbarGtk, gboolean, 171 CHROMEGTK_CALLBACK_1(BrowserActionsToolbarGtk, gboolean,
172 OnOverflowMenuButtonPress, GdkEventButton*); 172 OnOverflowMenuButtonPress, GdkEventButton*);
173 CHROMEGTK_CALLBACK_0(BrowserActionsToolbarGtk, void, OnButtonShowOrHide); 173 CHROMEGTK_CALLBACK_0(BrowserActionsToolbarGtk, void, OnButtonShowOrHide);
174 174
175 Browser* browser_; 175 Browser* browser_;
176 176
177 Profile* profile_; 177 Profile* profile_;
178 ThemeServiceGtk* theme_service_; 178 GtkThemeService* theme_service_;
179 179
180 ExtensionToolbarModel* model_; 180 ExtensionToolbarModel* model_;
181 181
182 // Contains the drag gripper, browser action buttons, and overflow chevron. 182 // Contains the drag gripper, browser action buttons, and overflow chevron.
183 ui::OwnedWidgetGtk hbox_; 183 ui::OwnedWidgetGtk hbox_;
184 184
185 // Contains the browser action buttons. 185 // Contains the browser action buttons.
186 ui::OwnedWidgetGtk button_hbox_; 186 ui::OwnedWidgetGtk button_hbox_;
187 187
188 // The overflow button for chrome theme mode. 188 // The overflow button for chrome theme mode.
(...skipping 30 matching lines...) Expand all
219 ui::GtkSignalRegistrar signals_; 219 ui::GtkSignalRegistrar signals_;
220 220
221 content::NotificationRegistrar registrar_; 221 content::NotificationRegistrar registrar_;
222 222
223 base::WeakPtrFactory<BrowserActionsToolbarGtk> weak_factory_; 223 base::WeakPtrFactory<BrowserActionsToolbarGtk> weak_factory_;
224 224
225 DISALLOW_COPY_AND_ASSIGN(BrowserActionsToolbarGtk); 225 DISALLOW_COPY_AND_ASSIGN(BrowserActionsToolbarGtk);
226 }; 226 };
227 227
228 #endif // CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ 228 #endif // CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc ('k') | chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698