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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.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_CONTROLLER_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 int GetMaxWidthForMenu(views::MenuItemView* view) override; 116 int GetMaxWidthForMenu(views::MenuItemView* view) override;
117 void WillShowMenu(views::MenuItemView* menu) override; 117 void WillShowMenu(views::MenuItemView* menu) override;
118 118
119 // bookmarks::BaseBookmarkModelObserver: 119 // bookmarks::BaseBookmarkModelObserver:
120 void BookmarkModelChanged() override; 120 void BookmarkModelChanged() override;
121 121
122 private: 122 private:
123 // BookmarkMenuController deletes itself as necessary. 123 // BookmarkMenuController deletes itself as necessary.
124 ~BookmarkMenuController() override; 124 ~BookmarkMenuController() override;
125 125
126 scoped_ptr<views::MenuRunner> menu_runner_; 126 std::unique_ptr<views::MenuRunner> menu_runner_;
127 127
128 scoped_ptr<BookmarkMenuDelegate> menu_delegate_; 128 std::unique_ptr<BookmarkMenuDelegate> menu_delegate_;
129 129
130 // The node we're showing the contents of. 130 // The node we're showing the contents of.
131 const bookmarks::BookmarkNode* node_; 131 const bookmarks::BookmarkNode* node_;
132 132
133 // Data for the drop. 133 // Data for the drop.
134 bookmarks::BookmarkNodeData drop_data_; 134 bookmarks::BookmarkNodeData drop_data_;
135 135
136 // The observer, may be null. 136 // The observer, may be null.
137 BookmarkMenuControllerObserver* observer_; 137 BookmarkMenuControllerObserver* observer_;
138 138
139 // Is the menu being shown for a drop? 139 // Is the menu being shown for a drop?
140 bool for_drop_; 140 bool for_drop_;
141 141
142 // The bookmark bar. This is only non-null if we're showing a menu item for a 142 // The bookmark bar. This is only non-null if we're showing a menu item for a
143 // folder on the bookmark bar and not for drop, or if the BookmarkBarView has 143 // folder on the bookmark bar and not for drop, or if the BookmarkBarView has
144 // been destroyed before the menu. 144 // been destroyed before the menu.
145 BookmarkBarView* bookmark_bar_; 145 BookmarkBarView* bookmark_bar_;
146 146
147 DISALLOW_COPY_AND_ASSIGN(BookmarkMenuController); 147 DISALLOW_COPY_AND_ASSIGN(BookmarkMenuController);
148 }; 148 };
149 149
150 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_ 150 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698