Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: chrome/browser/ui/views/frame/global_menu_bar_x11.h

Issue 815983002: Topsites become keyedService based. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove extra inclusion from testing_profile.h Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/views/frame/global_menu_bar_x11.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/views/frame/global_menu_bar_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698