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

Unified Diff: chrome/browser/ui/app_list/app_list_service_views.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/app_list/app_list_service_views.h
diff --git a/chrome/browser/ui/app_list/app_list_service_views.h b/chrome/browser/ui/app_list/app_list_service_views.h
index 92216a0897a79021ceb22e0c8421e018875c3fa2..dfe2af19a0381f64a9282656f29af7eb4dba6167 100644
--- a/chrome/browser/ui/app_list/app_list_service_views.h
+++ b/chrome/browser/ui/app_list/app_list_service_views.h
@@ -5,8 +5,9 @@
#ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_VIEWS_H_
#define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_VIEWS_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/ui/app_list/app_list_service_impl.h"
#include "chrome/browser/ui/app_list/app_list_shower_delegate.h"
#include "chrome/browser/ui/app_list/app_list_shower_views.h"
@@ -19,7 +20,7 @@ class AppListServiceViews : public AppListServiceImpl,
public AppListShowerDelegate {
public:
explicit AppListServiceViews(
- scoped_ptr<AppListControllerDelegate> controller_delegate);
+ std::unique_ptr<AppListControllerDelegate> controller_delegate);
~AppListServiceViews() override;
// Set |can_dismiss| to prevent the app list dismissing when losing focus. For
@@ -63,7 +64,7 @@ class AppListServiceViews : public AppListServiceImpl,
AppListShower shower_;
bool can_dismiss_;
- scoped_ptr<AppListControllerDelegate> controller_delegate_;
+ std::unique_ptr<AppListControllerDelegate> controller_delegate_;
DISALLOW_COPY_AND_ASSIGN(AppListServiceViews);
};
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_unittest.cc ('k') | chrome/browser/ui/app_list/app_list_service_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698