| 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/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "base/prefs/pref_change_registrar.h" | |
| 15 #include "base/scoped_observer.h" | 14 #include "base/scoped_observer.h" |
| 16 #include "chrome/browser/command_observer.h" | 15 #include "chrome/browser/command_observer.h" |
| 17 #include "chrome/browser/profiles/avatar_menu.h" | 16 #include "chrome/browser/profiles/avatar_menu.h" |
| 18 #include "chrome/browser/profiles/avatar_menu_observer.h" | 17 #include "chrome/browser/profiles/avatar_menu_observer.h" |
| 19 #include "chrome/browser/ui/browser_list_observer.h" | 18 #include "chrome/browser/ui/browser_list_observer.h" |
| 20 #include "components/history/core/browser/history_types.h" | 19 #include "components/history/core/browser/history_types.h" |
| 21 #include "components/history/core/browser/top_sites_observer.h" | 20 #include "components/history/core/browser/top_sites_observer.h" |
| 21 #include "components/prefs/pref_change_registrar.h" |
| 22 #include "components/sessions/core/tab_restore_service.h" | 22 #include "components/sessions/core/tab_restore_service.h" |
| 23 #include "components/sessions/core/tab_restore_service_observer.h" | 23 #include "components/sessions/core/tab_restore_service_observer.h" |
| 24 #include "ui/base/glib/glib_signal.h" | 24 #include "ui/base/glib/glib_signal.h" |
| 25 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" | 25 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h" |
| 26 | 26 |
| 27 typedef struct _DbusmenuMenuitem DbusmenuMenuitem; | 27 typedef struct _DbusmenuMenuitem DbusmenuMenuitem; |
| 28 typedef struct _DbusmenuServer DbusmenuServer; | 28 typedef struct _DbusmenuServer DbusmenuServer; |
| 29 | 29 |
| 30 namespace history { | 30 namespace history { |
| 31 class TopSites; | 31 class TopSites; |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 183 |
| 184 ScopedObserver<history::TopSites, history::TopSitesObserver> scoped_observer_; | 184 ScopedObserver<history::TopSites, history::TopSitesObserver> scoped_observer_; |
| 185 | 185 |
| 186 // For callbacks may be run after destruction. | 186 // For callbacks may be run after destruction. |
| 187 base::WeakPtrFactory<GlobalMenuBarX11> weak_ptr_factory_; | 187 base::WeakPtrFactory<GlobalMenuBarX11> weak_ptr_factory_; |
| 188 | 188 |
| 189 DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11); | 189 DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11); |
| 190 }; | 190 }; |
| 191 | 191 |
| 192 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_ | 192 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_ |
| OLD | NEW |