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

Unified Diff: chromecast/browser/cast_browser_process.h

Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « chromecast/browser/cast_browser_main_parts.cc ('k') | chromecast/browser/cast_browser_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/cast_browser_process.h
diff --git a/chromecast/browser/cast_browser_process.h b/chromecast/browser/cast_browser_process.h
index 2df7916ac73769698df425bfc64604e60394061b..af5ab10870a8d4d95aba4dad68150311cebc9839 100644
--- a/chromecast/browser/cast_browser_process.h
+++ b/chromecast/browser/cast_browser_process.h
@@ -5,9 +5,10 @@
#ifndef CHROMECAST_BROWSER_CAST_BROWSER_PROCESS_H_
#define CHROMECAST_BROWSER_CAST_BROWSER_PROCESS_H_
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
class PrefService;
@@ -45,23 +46,25 @@ class CastBrowserProcess {
CastBrowserProcess();
virtual ~CastBrowserProcess();
- void SetBrowserContext(scoped_ptr<CastBrowserContext> browser_context);
+ void SetBrowserContext(std::unique_ptr<CastBrowserContext> browser_context);
void SetCastContentBrowserClient(CastContentBrowserClient* browser_client);
- void SetCastService(scoped_ptr<CastService> cast_service);
+ void SetCastService(std::unique_ptr<CastService> cast_service);
#if defined(USE_AURA)
- void SetCastScreen(scoped_ptr<CastScreen> cast_screen);
+ void SetCastScreen(std::unique_ptr<CastScreen> cast_screen);
#endif // defined(USE_AURA)
- void SetMetricsHelper(scoped_ptr<metrics::CastMetricsHelper> metrics_helper);
+ void SetMetricsHelper(
+ std::unique_ptr<metrics::CastMetricsHelper> metrics_helper);
void SetMetricsServiceClient(
- scoped_ptr<metrics::CastMetricsServiceClient> metrics_service_client);
- void SetPrefService(scoped_ptr<PrefService> pref_service);
+ std::unique_ptr<metrics::CastMetricsServiceClient>
+ metrics_service_client);
+ void SetPrefService(std::unique_ptr<PrefService> pref_service);
void SetRemoteDebuggingServer(
- scoped_ptr<RemoteDebuggingServer> remote_debugging_server);
+ std::unique_ptr<RemoteDebuggingServer> remote_debugging_server);
void SetResourceDispatcherHostDelegate(
- scoped_ptr<CastResourceDispatcherHostDelegate> delegate);
+ std::unique_ptr<CastResourceDispatcherHostDelegate> delegate);
#if defined(OS_ANDROID)
void SetCrashDumpManager(
- scoped_ptr<breakpad::CrashDumpManager> crash_dump_manager);
+ std::unique_ptr<breakpad::CrashDumpManager> crash_dump_manager);
#endif // defined(OS_ANDROID)
void SetConnectivityChecker(
scoped_refptr<ConnectivityChecker> connectivity_checker);
@@ -91,26 +94,26 @@ class CastBrowserProcess {
private:
// Note: The following order should match the order they are set in
// CastBrowserMainParts.
- scoped_ptr<metrics::CastMetricsHelper> metrics_helper_;
+ std::unique_ptr<metrics::CastMetricsHelper> metrics_helper_;
#if defined(USE_AURA)
- scoped_ptr<CastScreen> cast_screen_;
+ std::unique_ptr<CastScreen> cast_screen_;
#endif // defined(USE_AURA)
- scoped_ptr<PrefService> pref_service_;
+ std::unique_ptr<PrefService> pref_service_;
scoped_refptr<ConnectivityChecker> connectivity_checker_;
- scoped_ptr<CastBrowserContext> browser_context_;
- scoped_ptr<metrics::CastMetricsServiceClient> metrics_service_client_;
- scoped_ptr<CastResourceDispatcherHostDelegate>
+ std::unique_ptr<CastBrowserContext> browser_context_;
+ std::unique_ptr<metrics::CastMetricsServiceClient> metrics_service_client_;
+ std::unique_ptr<CastResourceDispatcherHostDelegate>
resource_dispatcher_host_delegate_;
#if defined(OS_ANDROID)
- scoped_ptr<breakpad::CrashDumpManager> crash_dump_manager_;
+ std::unique_ptr<breakpad::CrashDumpManager> crash_dump_manager_;
#endif // defined(OS_ANDROID)
- scoped_ptr<RemoteDebuggingServer> remote_debugging_server_;
+ std::unique_ptr<RemoteDebuggingServer> remote_debugging_server_;
CastContentBrowserClient* cast_content_browser_client_;
net::NetLog* net_log_;
// Note: CastService must be destroyed before others.
- scoped_ptr<CastService> cast_service_;
+ std::unique_ptr<CastService> cast_service_;
DISALLOW_COPY_AND_ASSIGN(CastBrowserProcess);
};
« no previous file with comments | « chromecast/browser/cast_browser_main_parts.cc ('k') | chromecast/browser/cast_browser_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698