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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 // Maps from menu id to BookmarkNode. 194 // Maps from menu id to BookmarkNode.
195 MenuIDToNodeMap menu_id_to_node_map_; 195 MenuIDToNodeMap menu_id_to_node_map_;
196 196
197 // Current menu. 197 // Current menu.
198 views::MenuItemView* menu_; 198 views::MenuItemView* menu_;
199 199
200 // Data for the drop. 200 // Data for the drop.
201 bookmarks::BookmarkNodeData drop_data_; 201 bookmarks::BookmarkNodeData drop_data_;
202 202
203 // Used when a context menu is shown. 203 // Used when a context menu is shown.
204 scoped_ptr<BookmarkContextMenu> context_menu_; 204 std::unique_ptr<BookmarkContextMenu> context_menu_;
205 205
206 // If non-NULL this is the |parent| passed to Init and is NOT owned by us. 206 // If non-NULL this is the |parent| passed to Init and is NOT owned by us.
207 views::MenuItemView* parent_menu_item_; 207 views::MenuItemView* parent_menu_item_;
208 208
209 // Maps from node to menu. 209 // Maps from node to menu.
210 NodeToMenuMap node_to_menu_map_; 210 NodeToMenuMap node_to_menu_map_;
211 211
212 // ID of the next menu item. 212 // ID of the next menu item.
213 int next_menu_id_; 213 int next_menu_id_;
214 214
215 views::MenuDelegate* real_delegate_; 215 views::MenuDelegate* real_delegate_;
216 216
217 // Is the model being changed? 217 // Is the model being changed?
218 bool is_mutating_model_; 218 bool is_mutating_model_;
219 219
220 // The location where this bookmark menu will be displayed (for UMA). 220 // The location where this bookmark menu will be displayed (for UMA).
221 BookmarkLaunchLocation location_; 221 BookmarkLaunchLocation location_;
222 222
223 DISALLOW_COPY_AND_ASSIGN(BookmarkMenuDelegate); 223 DISALLOW_COPY_AND_ASSIGN(BookmarkMenuDelegate);
224 }; 224 };
225 225
226 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_ 226 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698