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

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

Powered by Google App Engine
This is Rietveld 408576698