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

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

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/common/event_param_traits.cc ('k') | components/mus/demo/mus_demo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/demo/mus_demo.h
diff --git a/components/mus/demo/mus_demo.h b/components/mus/demo/mus_demo.h
index 3c5268c390a3a909a4080ed2bd80c38590d9bb11..c5aea8401abdb80f7d204c1e5949fa9d98cf7ece 100644
--- a/components/mus/demo/mus_demo.h
+++ b/components/mus/demo/mus_demo.h
@@ -6,12 +6,12 @@
#define COMPONENTS_MUS_DEMO_MUS_DEMO_H_
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/timer/timer.h"
#include "components/mus/public/cpp/window.h"
#include "components/mus/public/cpp/window_manager_delegate.h"
@@ -53,9 +53,10 @@ class MusDemo : public shell::ShellClient,
// WindowManagerDelegate:
void SetWindowManagerClient(mus::WindowManagerClient* client) override;
bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override;
- bool OnWmSetProperty(mus::Window* window,
- const std::string& name,
- scoped_ptr<std::vector<uint8_t>>* new_data) override;
+ bool OnWmSetProperty(
+ mus::Window* window,
+ const std::string& name,
+ std::unique_ptr<std::vector<uint8_t>>* new_data) override;
mus::Window* OnWmCreateTopLevelWindow(
std::map<std::string, std::vector<uint8_t>>* properties) override;
void OnAccelerator(uint32_t id, const ui::Event& event) override;
@@ -72,7 +73,7 @@ class MusDemo : public shell::ShellClient,
mus::mojom::WindowTreeHostPtr window_tree_host_;
// Used to send frames to mus.
- scoped_ptr<bitmap_uploader::BitmapUploader> uploader_;
+ std::unique_ptr<bitmap_uploader::BitmapUploader> uploader_;
// Bitmap that is the same size as our client window area.
SkBitmap bitmap_;
« no previous file with comments | « components/mus/common/event_param_traits.cc ('k') | components/mus/demo/mus_demo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698