| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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> |
| 11 | 11 |
| 12 #include "base/memory/linked_ptr.h" | 12 #include "base/memory/linked_ptr.h" |
| 13 #include "base/task.h" | 13 #include "base/task.h" |
| 14 #include "chrome/browser/extensions/extension_toolbar_model.h" | 14 #include "chrome/browser/extensions/extension_toolbar_model.h" |
| 15 #include "chrome/browser/ui/gtk/custom_button.h" | 15 #include "chrome/browser/ui/gtk/custom_button.h" |
| 16 #include "chrome/browser/ui/gtk/menu_gtk.h" | 16 #include "chrome/browser/ui/gtk/menu_gtk.h" |
| 17 #include "chrome/browser/ui/gtk/overflow_button.h" | 17 #include "chrome/browser/ui/gtk/overflow_button.h" |
| 18 #include "chrome/browser/ui/gtk/owned_widget_gtk.h" | |
| 19 #include "content/common/notification_observer.h" | 18 #include "content/common/notification_observer.h" |
| 20 #include "content/common/notification_registrar.h" | 19 #include "content/common/notification_registrar.h" |
| 21 #include "ui/base/animation/animation_delegate.h" | 20 #include "ui/base/animation/animation_delegate.h" |
| 22 #include "ui/base/animation/slide_animation.h" | 21 #include "ui/base/animation/slide_animation.h" |
| 23 #include "ui/base/gtk/gtk_signal.h" | 22 #include "ui/base/gtk/gtk_signal.h" |
| 24 #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" |
| 25 #include "ui/base/models/simple_menu_model.h" | 25 #include "ui/base/models/simple_menu_model.h" |
| 26 | 26 |
| 27 class Browser; | 27 class Browser; |
| 28 class BrowserActionButton; | 28 class BrowserActionButton; |
| 29 class Extension; | 29 class Extension; |
| 30 class GtkThemeService; | 30 class GtkThemeService; |
| 31 class Profile; | 31 class Profile; |
| 32 | 32 |
| 33 typedef struct _GdkDragContext GdkDragContext; | 33 typedef struct _GdkDragContext GdkDragContext; |
| 34 typedef struct _GtkWidget GtkWidget; | 34 typedef struct _GtkWidget GtkWidget; |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 CHROMEGTK_CALLBACK_0(BrowserActionsToolbarGtk, void, OnButtonShowOrHide); | 168 CHROMEGTK_CALLBACK_0(BrowserActionsToolbarGtk, void, OnButtonShowOrHide); |
| 169 | 169 |
| 170 Browser* browser_; | 170 Browser* browser_; |
| 171 | 171 |
| 172 Profile* profile_; | 172 Profile* profile_; |
| 173 GtkThemeService* theme_service_; | 173 GtkThemeService* theme_service_; |
| 174 | 174 |
| 175 ExtensionToolbarModel* model_; | 175 ExtensionToolbarModel* model_; |
| 176 | 176 |
| 177 // Contains the drag gripper, browser action buttons, and overflow chevron. | 177 // Contains the drag gripper, browser action buttons, and overflow chevron. |
| 178 OwnedWidgetGtk hbox_; | 178 ui::OwnedWidgetGtk hbox_; |
| 179 | 179 |
| 180 // Contains the browser action buttons. | 180 // Contains the browser action buttons. |
| 181 OwnedWidgetGtk button_hbox_; | 181 ui::OwnedWidgetGtk button_hbox_; |
| 182 | 182 |
| 183 // The overflow button for chrome theme mode. | 183 // The overflow button for chrome theme mode. |
| 184 scoped_ptr<CustomDrawButton> overflow_button_; | 184 scoped_ptr<CustomDrawButton> overflow_button_; |
| 185 // The separator just next to the overflow button. Only shown in GTK+ theme | 185 // The separator just next to the overflow button. Only shown in GTK+ theme |
| 186 // mode. In Chrome theme mode, the overflow button has a separator built in. | 186 // mode. In Chrome theme mode, the overflow button has a separator built in. |
| 187 GtkWidget* separator_; | 187 GtkWidget* separator_; |
| 188 scoped_ptr<MenuGtk> overflow_menu_; | 188 scoped_ptr<MenuGtk> overflow_menu_; |
| 189 scoped_ptr<ui::SimpleMenuModel> overflow_menu_model_; | 189 scoped_ptr<ui::SimpleMenuModel> overflow_menu_model_; |
| 190 GtkWidget* overflow_area_; | 190 GtkWidget* overflow_area_; |
| 191 // A widget for adding extra padding to the left of the overflow button. | 191 // A widget for adding extra padding to the left of the overflow button. |
| (...skipping 22 matching lines...) Expand all Loading... |
| 214 ui::GtkSignalRegistrar signals_; | 214 ui::GtkSignalRegistrar signals_; |
| 215 | 215 |
| 216 NotificationRegistrar registrar_; | 216 NotificationRegistrar registrar_; |
| 217 | 217 |
| 218 ScopedRunnableMethodFactory<BrowserActionsToolbarGtk> method_factory_; | 218 ScopedRunnableMethodFactory<BrowserActionsToolbarGtk> method_factory_; |
| 219 | 219 |
| 220 DISALLOW_COPY_AND_ASSIGN(BrowserActionsToolbarGtk); | 220 DISALLOW_COPY_AND_ASSIGN(BrowserActionsToolbarGtk); |
| 221 }; | 221 }; |
| 222 | 222 |
| 223 #endif // CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ | 223 #endif // CHROME_BROWSER_UI_GTK_BROWSER_ACTIONS_TOOLBAR_GTK_H_ |
| OLD | NEW |