| 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_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 |
| 12 #include "app/active_window_watcher_x.h" | |
| 13 #include "app/gtk_signal.h" | |
| 14 #include "app/gtk_signal_registrar.h" | |
| 15 #include "base/scoped_ptr.h" | 12 #include "base/scoped_ptr.h" |
| 16 #include "chrome/browser/command_updater.h" | 13 #include "chrome/browser/command_updater.h" |
| 17 #include "chrome/browser/prefs/pref_member.h" | 14 #include "chrome/browser/prefs/pref_member.h" |
| 18 #include "chrome/browser/ui/gtk/custom_button.h" | 15 #include "chrome/browser/ui/gtk/custom_button.h" |
| 19 #include "chrome/browser/ui/gtk/menu_gtk.h" | 16 #include "chrome/browser/ui/gtk/menu_gtk.h" |
| 20 #include "chrome/browser/ui/gtk/owned_widget_gtk.h" | 17 #include "chrome/browser/ui/gtk/owned_widget_gtk.h" |
| 21 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 18 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
| 22 #include "chrome/common/notification_observer.h" | 19 #include "chrome/common/notification_observer.h" |
| 23 #include "chrome/common/notification_registrar.h" | 20 #include "chrome/common/notification_registrar.h" |
| 21 #include "ui/base/gtk/gtk_signal.h" |
| 22 #include "ui/base/gtk/gtk_signal_registrar.h" |
| 24 #include "ui/base/models/accelerator.h" | 23 #include "ui/base/models/accelerator.h" |
| 25 #include "ui/base/models/simple_menu_model.h" | 24 #include "ui/base/models/simple_menu_model.h" |
| 26 | 25 |
| 27 class BackForwardButtonGtk; | 26 class BackForwardButtonGtk; |
| 28 class Browser; | 27 class Browser; |
| 29 class BrowserActionsToolbarGtk; | 28 class BrowserActionsToolbarGtk; |
| 30 class BrowserWindowGtk; | 29 class BrowserWindowGtk; |
| 31 class CustomDrawButton; | 30 class CustomDrawButton; |
| 32 class GtkThemeProvider; | 31 class GtkThemeProvider; |
| 33 class LocationBar; | 32 class LocationBar; |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 StringPrefMember home_page_; | 203 StringPrefMember home_page_; |
| 205 BooleanPrefMember home_page_is_new_tab_page_; | 204 BooleanPrefMember home_page_is_new_tab_page_; |
| 206 | 205 |
| 207 NotificationRegistrar registrar_; | 206 NotificationRegistrar registrar_; |
| 208 | 207 |
| 209 // A GtkEntry that isn't part of the hierarchy. We keep this for native | 208 // A GtkEntry that isn't part of the hierarchy. We keep this for native |
| 210 // rendering. | 209 // rendering. |
| 211 OwnedWidgetGtk offscreen_entry_; | 210 OwnedWidgetGtk offscreen_entry_; |
| 212 | 211 |
| 213 // Manages the home button drop signal handler. | 212 // Manages the home button drop signal handler. |
| 214 scoped_ptr<GtkSignalRegistrar> drop_handler_; | 213 scoped_ptr<ui::GtkSignalRegistrar> drop_handler_; |
| 215 | 214 |
| 216 DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk); | 215 DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk); |
| 217 }; | 216 }; |
| 218 | 217 |
| 219 #endif // CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_ | 218 #endif // CHROME_BROWSER_UI_GTK_BROWSER_TOOLBAR_GTK_H_ |
| OLD | NEW |