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

Unified Diff: ui/android/resources/resource_manager.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
Index: ui/android/resources/resource_manager.h
diff --git a/ui/android/resources/resource_manager.h b/ui/android/resources/resource_manager.h
index 2dfe4c895e99f59f0a247ad82e432226b406f295..5161ace541078aafd1966424fdc19077a0fc30dd 100644
--- a/ui/android/resources/resource_manager.h
+++ b/ui/android/resources/resource_manager.h
@@ -5,8 +5,9 @@
#ifndef UI_ANDROID_RESOURCES_RESOURCE_MANAGER_H_
#define UI_ANDROID_RESOURCES_RESOURCE_MANAGER_H_
+#include <memory>
+
#include "base/android/jni_android.h"
-#include "base/memory/scoped_ptr.h"
#include "cc/resources/scoped_ui_resource.h"
#include "ui/android/resources/crushed_sprite_resource.h"
#include "ui/android/ui_android_export.h"
@@ -43,7 +44,7 @@ class UI_ANDROID_EXPORT ResourceManager {
gfx::Rect Border(const gfx::Size& bounds) const;
gfx::Rect Border(const gfx::Size& bounds, const gfx::InsetsF& scale) const;
- scoped_ptr<cc::ScopedUIResource> ui_resource;
+ std::unique_ptr<cc::ScopedUIResource> ui_resource;
gfx::Size size;
gfx::Rect padding;
gfx::Rect aperture;
« no previous file with comments | « ui/android/resources/crushed_sprite_resource.h ('k') | ui/android/resources/resource_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698