| 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 |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 CommandIDMenuItemMap id_to_menu_item_; | 165 CommandIDMenuItemMap id_to_menu_item_; |
| 166 | 166 |
| 167 DbusmenuServer* server_; | 167 DbusmenuServer* server_; |
| 168 DbusmenuMenuitem* root_item_; | 168 DbusmenuMenuitem* root_item_; |
| 169 DbusmenuMenuitem* history_menu_; | 169 DbusmenuMenuitem* history_menu_; |
| 170 DbusmenuMenuitem* profiles_menu_; | 170 DbusmenuMenuitem* profiles_menu_; |
| 171 | 171 |
| 172 // Tracks value of the kShowBookmarkBar preference. | 172 // Tracks value of the kShowBookmarkBar preference. |
| 173 PrefChangeRegistrar pref_change_registrar_; | 173 PrefChangeRegistrar pref_change_registrar_; |
| 174 | 174 |
| 175 history::TopSites* top_sites_; | 175 scoped_refptr<history::TopSites> top_sites_; |
| 176 | 176 |
| 177 TabRestoreService* tab_restore_service_; // weak | 177 TabRestoreService* tab_restore_service_; // weak |
| 178 | 178 |
| 179 scoped_ptr<AvatarMenu> avatar_menu_; | 179 scoped_ptr<AvatarMenu> avatar_menu_; |
| 180 | 180 |
| 181 ScopedObserver<history::TopSites, history::TopSitesObserver> scoped_observer_; | 181 ScopedObserver<history::TopSites, history::TopSitesObserver> scoped_observer_; |
| 182 | 182 |
| 183 // For callbacks may be run after destruction. | 183 // For callbacks may be run after destruction. |
| 184 base::WeakPtrFactory<GlobalMenuBarX11> weak_ptr_factory_; | 184 base::WeakPtrFactory<GlobalMenuBarX11> weak_ptr_factory_; |
| 185 | 185 |
| 186 DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11); | 186 DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11); |
| 187 }; | 187 }; |
| 188 | 188 |
| 189 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_ | 189 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_ |
| OLD | NEW |