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

Unified Diff: components/mus/demo/mus_demo.cc

Issue 1906623003: Convert //components/mus 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 | « components/mus/demo/mus_demo.h ('k') | components/mus/gles2/command_buffer_driver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/demo/mus_demo.cc
diff --git a/components/mus/demo/mus_demo.cc b/components/mus/demo/mus_demo.cc
index 32a23ff361bddb3527d8c94344d32943864cb723..56dd3d45fdd7a8597f0e59a232a62b40b0765f93 100644
--- a/components/mus/demo/mus_demo.cc
+++ b/components/mus/demo/mus_demo.cc
@@ -98,7 +98,7 @@ bool MusDemo::OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) {
bool MusDemo::OnWmSetProperty(mus::Window* window,
const std::string& name,
- scoped_ptr<std::vector<uint8_t>>* new_data) {
+ std::unique_ptr<std::vector<uint8_t>>* new_data) {
return true;
}
@@ -147,7 +147,7 @@ void MusDemo::DrawFrame() {
const unsigned char* addr =
static_cast<const unsigned char*>(bitmap_.getPixels());
const int bytes = bounds.width() * bounds.height() * 4;
- scoped_ptr<std::vector<unsigned char>> data(
+ std::unique_ptr<std::vector<unsigned char>> data(
new std::vector<unsigned char>(addr, addr + bytes));
bitmap_.unlockPixels();
« no previous file with comments | « components/mus/demo/mus_demo.h ('k') | components/mus/gles2/command_buffer_driver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698