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

Unified Diff: chromecast/browser/android/cast_window_android.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/base/system_time_change_notifier_unittest.cc ('k') | chromecast/browser/cast_browser_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/android/cast_window_android.h
diff --git a/chromecast/browser/android/cast_window_android.h b/chromecast/browser/android/cast_window_android.h
index dce0c7b172e8d2c257fe147b43af515ed62ef45d..35b62f7425e2d022a80edc338c9d360d1e34f485 100644
--- a/chromecast/browser/android/cast_window_android.h
+++ b/chromecast/browser/android/cast_window_android.h
@@ -7,6 +7,8 @@
#include <jni.h>
#include <stdint.h>
+
+#include <memory>
#include <vector>
#include "base/android/jni_string.h"
@@ -14,7 +16,6 @@
#include "base/callback_forward.h"
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "build/build_config.h"
#include "content/public/browser/web_contents.h"
@@ -81,8 +82,8 @@ class CastWindowAndroid : public content::WebContentsDelegate,
content::BrowserContext* browser_context_;
base::android::ScopedJavaGlobalRef<jobject> window_java_;
- scoped_ptr<content::WebContents> web_contents_;
- scoped_ptr<CastContentWindow> content_window_;
+ std::unique_ptr<content::WebContents> web_contents_;
+ std::unique_ptr<CastContentWindow> content_window_;
base::WeakPtrFactory<CastWindowAndroid> weak_factory_;
« no previous file with comments | « chromecast/base/system_time_change_notifier_unittest.cc ('k') | chromecast/browser/cast_browser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698