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 "app/gtk_signal.h" | |
13 #include "app/gtk_signal_registrar.h" | |
14 #include "base/linked_ptr.h" | 12 #include "base/linked_ptr.h" |
15 #include "base/task.h" | 13 #include "base/task.h" |
16 #include "chrome/browser/extensions/extension_toolbar_model.h" | 14 #include "chrome/browser/extensions/extension_toolbar_model.h" |
17 #include "chrome/browser/ui/gtk/custom_button.h" | 15 #include "chrome/browser/ui/gtk/custom_button.h" |
18 #include "chrome/browser/ui/gtk/menu_gtk.h" | 16 #include "chrome/browser/ui/gtk/menu_gtk.h" |
19 #include "chrome/browser/ui/gtk/overflow_button.h" | 17 #include "chrome/browser/ui/gtk/overflow_button.h" |
20 #include "chrome/browser/ui/gtk/owned_widget_gtk.h" | 18 #include "chrome/browser/ui/gtk/owned_widget_gtk.h" |
21 #include "chrome/common/notification_observer.h" | 19 #include "chrome/common/notification_observer.h" |
22 #include "chrome/common/notification_registrar.h" | 20 #include "chrome/common/notification_registrar.h" |
23 #include "ui/base/animation/animation_delegate.h" | 21 #include "ui/base/animation/animation_delegate.h" |
24 #include "ui/base/animation/slide_animation.h" | 22 #include "ui/base/animation/slide_animation.h" |
| 23 #include "ui/base/gtk/gtk_signal.h" |
| 24 #include "ui/base/gtk/gtk_signal_registrar.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 GtkThemeProvider; | 30 class GtkThemeProvider; |
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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 ExtensionButtonMap; | 204 ExtensionButtonMap; |
205 ExtensionButtonMap extension_button_map_; | 205 ExtensionButtonMap extension_button_map_; |
206 | 206 |
207 // We use this animation for the smart resizing of the toolbar. | 207 // We use this animation for the smart resizing of the toolbar. |
208 ui::SlideAnimation resize_animation_; | 208 ui::SlideAnimation resize_animation_; |
209 // This is the final width we are animating towards. | 209 // This is the final width we are animating towards. |
210 int desired_width_; | 210 int desired_width_; |
211 // This is the width we were at when we started animating. | 211 // This is the width we were at when we started animating. |
212 int start_width_; | 212 int start_width_; |
213 | 213 |
214 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 |