ui/aura/window_tree_host_platform.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/aura/window_tree_host_platform.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/aura/window_tree_host_platform.h

diff --git a/ui/aura/window_tree_host_platform.h b/ui/aura/window_tree_host_platform.h

index 111a1cd5257c12ab04ec74890fba6e78941c5a57..eb25d34955027eb50747e7219d1f223b9ee280de 100644

--- a/ui/aura/window_tree_host_platform.h

+++ b/ui/aura/window_tree_host_platform.h

@@ -5,9 +5,10 @@

#ifndef UI_AURA_WINDOW_TREE_HOST_PLATFORM_H_

#define UI_AURA_WINDOW_TREE_HOST_PLATFORM_H_

+#include <memory>

#include "base/compiler_specific.h"

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "ui/aura/aura_export.h"

#include "ui/aura/window_tree_host.h"

#include "ui/gfx/native_widget_types.h"

@@ -41,7 +42,7 @@ class AURA_EXPORT WindowTreeHostPlatform

protected:

WindowTreeHostPlatform();

- void SetPlatformWindow(scoped_ptr<ui::PlatformWindow> window);

+ void SetPlatformWindow(std::unique_ptr<ui::PlatformWindow> window);

ui::PlatformWindow* platform_window() { return window_.get(); }

// ui::PlatformWindowDelegate:

@@ -59,7 +60,7 @@ class AURA_EXPORT WindowTreeHostPlatform

private:

gfx::AcceleratedWidget widget_;

- scoped_ptr<ui::PlatformWindow> window_;

+ std::unique_ptr<ui::PlatformWindow> window_;

gfx::NativeCursor current_cursor_;

gfx::Rect bounds_;

« no previous file with comments | « ui/aura/window_tree_host.cc ('k') | ui/aura/window_tree_host_platform.cc » ('j') | no next file with comments »