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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 DbusmenuMenuitem* history_menu_; 172 DbusmenuMenuitem* history_menu_;
173 DbusmenuMenuitem* profiles_menu_; 173 DbusmenuMenuitem* profiles_menu_;
174 174
175 // Tracks value of the kShowBookmarkBar preference. 175 // Tracks value of the kShowBookmarkBar preference.
176 PrefChangeRegistrar pref_change_registrar_; 176 PrefChangeRegistrar pref_change_registrar_;
177 177
178 scoped_refptr<history::TopSites> top_sites_; 178 scoped_refptr<history::TopSites> top_sites_;
179 179
180 sessions::TabRestoreService* tab_restore_service_; // weak 180 sessions::TabRestoreService* tab_restore_service_; // weak
181 181
182 scoped_ptr<AvatarMenu> avatar_menu_; 182 std::unique_ptr<AvatarMenu> avatar_menu_;
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_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698