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

Side by Side Diff: chrome/browser/ui/bookmarks/bookmark_context_menu_controller.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_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "components/bookmarks/browser/base_bookmark_model_observer.h" 13 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
14 #include "ui/base/models/simple_menu_model.h" 14 #include "ui/base/models/simple_menu_model.h"
15 #include "ui/gfx/native_widget_types.h" 15 #include "ui/gfx/native_widget_types.h"
16 16
17 class Browser; 17 class Browser;
18 class Profile; 18 class Profile;
19 19
20 namespace content { 20 namespace content {
21 class PageNavigator; 21 class PageNavigator;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 void BookmarkModelChanged() override; 92 void BookmarkModelChanged() override;
93 93
94 gfx::NativeWindow parent_window_; 94 gfx::NativeWindow parent_window_;
95 BookmarkContextMenuControllerDelegate* delegate_; 95 BookmarkContextMenuControllerDelegate* delegate_;
96 Browser* browser_; 96 Browser* browser_;
97 Profile* profile_; 97 Profile* profile_;
98 content::PageNavigator* navigator_; 98 content::PageNavigator* navigator_;
99 const bookmarks::BookmarkNode* parent_; 99 const bookmarks::BookmarkNode* parent_;
100 std::vector<const bookmarks::BookmarkNode*> selection_; 100 std::vector<const bookmarks::BookmarkNode*> selection_;
101 bookmarks::BookmarkModel* model_; 101 bookmarks::BookmarkModel* model_;
102 scoped_ptr<ui::SimpleMenuModel> menu_model_; 102 std::unique_ptr<ui::SimpleMenuModel> menu_model_;
103 // Used to detect deletion of |this| executing a command. 103 // Used to detect deletion of |this| executing a command.
104 base::WeakPtrFactory<BookmarkContextMenuController> weak_factory_; 104 base::WeakPtrFactory<BookmarkContextMenuController> weak_factory_;
105 105
106 DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenuController); 106 DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenuController);
107 }; 107 };
108 108
109 #endif // CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_ 109 #endif // CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698