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

Unified Diff: ui/views/examples/menu_example.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/examples/label_example.cc ('k') | ui/views/examples/multiline_example.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/menu_example.cc
diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc
index 166a792a847a4b4fab05d4642935619d24091b67..378c90a76bc00ec2ea86194b5851693ccc39ef20 100644
--- a/ui/views/examples/menu_example.cc
+++ b/ui/views/examples/menu_example.cc
@@ -51,7 +51,7 @@ class ExampleMenuModel : public ui::SimpleMenuModel,
COMMAND_GO_HOME,
};
- scoped_ptr<ui::SimpleMenuModel> submenu_;
+ std::unique_ptr<ui::SimpleMenuModel> submenu_;
std::set<int> checked_fruits_;
int current_encoding_command_id_;
@@ -71,8 +71,8 @@ class ExampleMenuButton : public MenuButton, public MenuButtonListener {
ui::SimpleMenuModel* GetMenuModel();
- scoped_ptr<ExampleMenuModel> menu_model_;
- scoped_ptr<MenuRunner> menu_runner_;
+ std::unique_ptr<ExampleMenuModel> menu_model_;
+ std::unique_ptr<MenuRunner> menu_runner_;
DISALLOW_COPY_AND_ASSIGN(ExampleMenuButton);
};
« no previous file with comments | « ui/views/examples/label_example.cc ('k') | ui/views/examples/multiline_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698