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

Unified Diff: ui/views_content_client/views_content_client_main_parts.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/views/window/non_client_view.cc ('k') | ui/views_content_client/views_content_client_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views_content_client/views_content_client_main_parts.h
diff --git a/ui/views_content_client/views_content_client_main_parts.h b/ui/views_content_client/views_content_client_main_parts.h
index 6c14d2f0c22e5b77fc4e84dc7d9e78c712c0ee1d..c0f73a06e049c45e38a652b029dd7d8059583975 100644
--- a/ui/views_content_client/views_content_client_main_parts.h
+++ b/ui/views_content_client/views_content_client_main_parts.h
@@ -5,8 +5,9 @@
#ifndef UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_
#define UI_VIEWS_CONTENT_CLIENT_VIEWS_CONTENT_CLIENT_MAIN_PARTS_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "content/public/browser/browser_main_parts.h"
namespace content {
@@ -50,9 +51,9 @@ class ViewsContentClientMainParts : public content::BrowserMainParts {
ViewsContentClient* views_content_client);
private:
- scoped_ptr<content::ShellBrowserContext> browser_context_;
+ std::unique_ptr<content::ShellBrowserContext> browser_context_;
- scoped_ptr<views::ViewsDelegate> views_delegate_;
+ std::unique_ptr<views::ViewsDelegate> views_delegate_;
ViewsContentClient* views_content_client_;
« no previous file with comments | « ui/views/window/non_client_view.cc ('k') | ui/views_content_client/views_content_client_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698