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

Unified Diff: chrome/browser/ui/views/create_application_shortcut_view.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/views/create_application_shortcut_view.h
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h
index 98dff35aed59335b8dfe30f8c7dc116d0c0d6109..e1b92c1585ec357351f5b9713d2059d91d2d472c 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.h
+++ b/chrome/browser/ui/views/create_application_shortcut_view.h
@@ -5,12 +5,12 @@
#ifndef CHROME_BROWSER_UI_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_
#define CHROME_BROWSER_UI_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_
+#include <memory>
#include <string>
#include <vector>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/web_applications/web_app.h"
#include "extensions/common/manifest_handlers/file_handler_info.h"
#include "ui/views/controls/button/button.h"
@@ -87,7 +87,7 @@ class CreateApplicationShortcutView : public views::DialogDelegateView,
views::Checkbox* quick_launch_check_box_;
// Target shortcut and file handler info.
- scoped_ptr<web_app::ShortcutInfo> shortcut_info_;
+ std::unique_ptr<web_app::ShortcutInfo> shortcut_info_;
extensions::FileHandlersInfo file_handlers_info_;
// If false, the shortcut will be created in the root level of the Start Menu.
bool create_in_chrome_apps_subdir_;
@@ -146,7 +146,7 @@ class CreateChromeApplicationShortcutView
private:
// Called when the app's ShortcutInfo (with icon) and FileHandlersInfo is
// loaded.
- void OnAppInfoLoaded(scoped_ptr<web_app::ShortcutInfo> shortcut_info,
+ void OnAppInfoLoaded(std::unique_ptr<web_app::ShortcutInfo> shortcut_info,
const extensions::FileHandlersInfo& file_handlers_info);
base::Callback<void(bool)> close_callback_;

Powered by Google App Engine
This is Rietveld 408576698