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

Unified Diff: chrome/browser/ui/app_list/arc/arc_app_context_menu.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/app_list/app_list_view_delegate.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_icon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/arc/arc_app_context_menu.cc
diff --git a/chrome/browser/ui/app_list/arc/arc_app_context_menu.cc b/chrome/browser/ui/app_list/arc/arc_app_context_menu.cc
index d189464213e521d910544c8a2a5ed65c19d727f8..f21d4036cc238904dc25d93a84837b5d1e36389b 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_context_menu.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_context_menu.cc
@@ -36,7 +36,8 @@ void ArcAppContextMenu::BuildMenu(ui::SimpleMenuModel* menu_model) {
bool ArcAppContextMenu::IsCommandIdEnabled(int command_id) const {
if (command_id == LAUNCH_NEW) {
ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(profile());
- scoped_ptr<ArcAppListPrefs::AppInfo> app_info = arc_prefs->GetApp(app_id());
+ std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
+ arc_prefs->GetApp(app_id());
return app_info && app_info->ready;
}
return AppContextMenu::IsCommandIdEnabled(command_id);
@@ -57,7 +58,8 @@ void ArcAppContextMenu::ExecuteCommand(int command_id, int event_flags) {
void ArcAppContextMenu::UninstallPackage() {
ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(profile());
- scoped_ptr<ArcAppListPrefs::AppInfo> app_info = arc_prefs->GetApp(app_id());
+ std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
+ arc_prefs->GetApp(app_id());
if (!app_info) {
LOG(ERROR) << "Package being uninstalling does not exist";
return;
@@ -67,6 +69,7 @@ void ArcAppContextMenu::UninstallPackage() {
bool ArcAppContextMenu::CanBeUninstalled() const {
ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(profile());
- scoped_ptr<ArcAppListPrefs::AppInfo> app_info = arc_prefs->GetApp(app_id());
+ std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
+ arc_prefs->GetApp(app_id());
return app_info && app_info->ready && !app_info->sticky;
}
« no previous file with comments | « chrome/browser/ui/app_list/app_list_view_delegate.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_icon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698