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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_editor_view.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_EDITOR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 void UpdateExpandedNodes( 222 void UpdateExpandedNodes(
223 EditorNode* editor_node, 223 EditorNode* editor_node,
224 bookmarks::BookmarkExpandedStateTracker::Nodes* expanded_nodes); 224 bookmarks::BookmarkExpandedStateTracker::Nodes* expanded_nodes);
225 225
226 ui::SimpleMenuModel* GetMenuModel(); 226 ui::SimpleMenuModel* GetMenuModel();
227 227
228 // Profile the entry is from. 228 // Profile the entry is from.
229 Profile* profile_; 229 Profile* profile_;
230 230
231 // Model driving the TreeView. 231 // Model driving the TreeView.
232 scoped_ptr<EditorTreeModel> tree_model_; 232 std::unique_ptr<EditorTreeModel> tree_model_;
233 233
234 // Displays star folder. 234 // Displays star folder.
235 views::TreeView* tree_view_; 235 views::TreeView* tree_view_;
236 236
237 // Used to create a new folder. 237 // Used to create a new folder.
238 scoped_ptr<views::LabelButton> new_folder_button_; 238 std::unique_ptr<views::LabelButton> new_folder_button_;
239 239
240 // The label for the url text field. 240 // The label for the url text field.
241 views::Label* url_label_; 241 views::Label* url_label_;
242 242
243 // The text field used for editing the URL. 243 // The text field used for editing the URL.
244 views::Textfield* url_tf_; 244 views::Textfield* url_tf_;
245 245
246 // The label for the title text field. 246 // The label for the title text field.
247 views::Label* title_label_; 247 views::Label* title_label_;
248 248
249 // The text field used for editing the title. 249 // The text field used for editing the title.
250 views::Textfield* title_tf_; 250 views::Textfield* title_tf_;
251 251
252 // Initial parent to select. Is only used if |details_.existing_node| is 252 // Initial parent to select. Is only used if |details_.existing_node| is
253 // NULL. 253 // NULL.
254 const bookmarks::BookmarkNode* parent_; 254 const bookmarks::BookmarkNode* parent_;
255 255
256 const EditDetails details_; 256 const EditDetails details_;
257 257
258 // The context menu. 258 // The context menu.
259 scoped_ptr<ui::SimpleMenuModel> context_menu_model_; 259 std::unique_ptr<ui::SimpleMenuModel> context_menu_model_;
260 scoped_ptr<views::MenuRunner> context_menu_runner_; 260 std::unique_ptr<views::MenuRunner> context_menu_runner_;
261 261
262 // Mode used to create nodes from. 262 // Mode used to create nodes from.
263 bookmarks::BookmarkModel* bb_model_; 263 bookmarks::BookmarkModel* bb_model_;
264 264
265 // If true, we're running the menu for the bookmark bar or other bookmarks 265 // If true, we're running the menu for the bookmark bar or other bookmarks
266 // nodes. 266 // nodes.
267 bool running_menu_for_root_; 267 bool running_menu_for_root_;
268 268
269 // Is the tree shown? 269 // Is the tree shown?
270 bool show_tree_; 270 bool show_tree_;
271 271
272 // List of deleted bookmark folders. 272 // List of deleted bookmark folders.
273 std::vector<int64_t> deletes_; 273 std::vector<int64_t> deletes_;
274 274
275 DISALLOW_COPY_AND_ASSIGN(BookmarkEditorView); 275 DISALLOW_COPY_AND_ASSIGN(BookmarkEditorView);
276 }; 276 };
277 277
278 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_ 278 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698