| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
| 13 #include "base/prefs/pref_change_registrar.h" | 13 #include "base/prefs/pref_change_registrar.h" |
| 14 #include "chrome/browser/command_observer.h" | 14 #include "chrome/browser/command_observer.h" |
| 15 #include "chrome/browser/history/history_types.h" | |
| 16 #include "chrome/browser/sessions/tab_restore_service.h" | 15 #include "chrome/browser/sessions/tab_restore_service.h" |
| 17 #include "chrome/browser/sessions/tab_restore_service_observer.h" | 16 #include "chrome/browser/sessions/tab_restore_service_observer.h" |
| 17 #include "components/history/core/browser/history_types.h" |
| 18 #include "content/public/browser/notification_observer.h" | 18 #include "content/public/browser/notification_observer.h" |
| 19 #include "content/public/browser/notification_registrar.h" | 19 #include "content/public/browser/notification_registrar.h" |
| 20 #include "ui/base/glib/glib_signal.h" | 20 #include "ui/base/glib/glib_signal.h" |
| 21 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" | 21 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" |
| 22 | 22 |
| 23 typedef struct _DbusmenuMenuitem DbusmenuMenuitem; | 23 typedef struct _DbusmenuMenuitem DbusmenuMenuitem; |
| 24 typedef struct _DbusmenuServer DbusmenuServer; | 24 typedef struct _DbusmenuServer DbusmenuServer; |
| 25 | 25 |
| 26 namespace history { | 26 namespace history { |
| 27 class TopSites; | 27 class TopSites; |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 159 |
| 160 content::NotificationRegistrar registrar_; | 160 content::NotificationRegistrar registrar_; |
| 161 | 161 |
| 162 // For callbacks may be run after destruction. | 162 // For callbacks may be run after destruction. |
| 163 base::WeakPtrFactory<GlobalMenuBarX11> weak_ptr_factory_; | 163 base::WeakPtrFactory<GlobalMenuBarX11> weak_ptr_factory_; |
| 164 | 164 |
| 165 DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11); | 165 DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11); |
| 166 }; | 166 }; |
| 167 | 167 |
| 168 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_ | 168 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_ |
| OLD | NEW |