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

Unified Diff: chrome/browser/ui/webui/ntp/app_launcher_handler.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/ntp/app_launcher_handler.h
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
index ff958fcbad7d485d5c0c32b545f47305279430e1..f774923ee6cd7a488fad42e6e3de1096ae9e3cb7 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
@@ -5,12 +5,12 @@
#ifndef CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
#define CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
+#include <memory>
#include <set>
#include <string>
#include "apps/metrics_names.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/task/cancelable_task_tracker.h"
#include "chrome/browser/extensions/extension_uninstall_dialog.h"
#include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
@@ -169,7 +169,7 @@ class AppLauncherHandler
extensions::ExtensionUninstallDialog* GetExtensionUninstallDialog();
// Continuation for installing a bookmark app after favicon lookup.
- void OnFaviconForApp(scoped_ptr<AppInstallInfo> install_info,
+ void OnFaviconForApp(std::unique_ptr<AppInstallInfo> install_info,
const favicon_base::FaviconImageResult& image_result);
// Sends |highlight_app_id_| to the js.
@@ -200,10 +200,11 @@ class AppLauncherHandler
PrefChangeRegistrar local_state_pref_change_registrar_;
// Used to show confirmation UI for uninstalling extensions in incognito mode.
- scoped_ptr<extensions::ExtensionUninstallDialog> extension_uninstall_dialog_;
+ std::unique_ptr<extensions::ExtensionUninstallDialog>
+ extension_uninstall_dialog_;
// Used to show confirmation UI for enabling extensions.
- scoped_ptr<ExtensionEnableFlow> extension_enable_flow_;
+ std::unique_ptr<ExtensionEnableFlow> extension_enable_flow_;
// The ids of apps to show on the NTP.
std::set<std::string> visible_apps_;

Powered by Google App Engine
This is Rietveld 408576698