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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_CONTEXT_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h" 10 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 views::MenuRunner::RunResult result) override; 71 views::MenuRunner::RunResult result) override;
72 72
73 // Overridden from BookmarkContextMenuControllerDelegate: 73 // Overridden from BookmarkContextMenuControllerDelegate:
74 void CloseMenu() override; 74 void CloseMenu() override;
75 void WillExecuteCommand( 75 void WillExecuteCommand(
76 int command_id, 76 int command_id,
77 const std::vector<const bookmarks::BookmarkNode*>& bookmarks) override; 77 const std::vector<const bookmarks::BookmarkNode*>& bookmarks) override;
78 void DidExecuteCommand(int command_id) override; 78 void DidExecuteCommand(int command_id) override;
79 79
80 private: 80 private:
81 scoped_ptr<BookmarkContextMenuController> controller_; 81 std::unique_ptr<BookmarkContextMenuController> controller_;
82 82
83 // The parent of dialog boxes opened from the context menu. 83 // The parent of dialog boxes opened from the context menu.
84 views::Widget* parent_widget_; 84 views::Widget* parent_widget_;
85 85
86 // The menu itself. This is owned by |menu_runner_|. 86 // The menu itself. This is owned by |menu_runner_|.
87 views::MenuItemView* menu_; 87 views::MenuItemView* menu_;
88 88
89 // Responsible for running the menu. 89 // Responsible for running the menu.
90 scoped_ptr<views::MenuRunner> menu_runner_; 90 std::unique_ptr<views::MenuRunner> menu_runner_;
91 91
92 BookmarkContextMenuObserver* observer_; 92 BookmarkContextMenuObserver* observer_;
93 93
94 // Should the menu close when a node is removed. 94 // Should the menu close when a node is removed.
95 bool close_on_remove_; 95 bool close_on_remove_;
96 96
97 DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenu); 97 DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenu);
98 }; 98 };
99 99
100 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_ 100 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698