| 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;
|
| }
|
|
|