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

Unified Diff: content/browser/android/content_view_render_view.h

Issue 1874893002: Convert //content/browser 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
Index: content/browser/android/content_view_render_view.h
diff --git a/content/browser/android/content_view_render_view.h b/content/browser/android/content_view_render_view.h
index 50f3b9c4f8336d0acc8deb22418559a2dc84cbc0..57fee7e21842c2499f88e1b19875f6019394dc01 100644
--- a/content/browser/android/content_view_render_view.h
+++ b/content/browser/android/content_view_render_view.h
@@ -5,10 +5,11 @@
#ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
#define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
+#include <memory>
+
#include "base/android/jni_weak_ref.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/android/compositor_client.h"
#include "ui/gfx/native_widget_types.h"
@@ -60,7 +61,7 @@ class ContentViewRenderView : public CompositorClient {
base::android::ScopedJavaGlobalRef<jobject> java_obj_;
- scoped_ptr<content::Compositor> compositor_;
+ std::unique_ptr<content::Compositor> compositor_;
gfx::NativeWindow root_window_;
int current_surface_format_;
« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | content/browser/android/content_view_render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698