content/browser/web_contents/aura/shadow_layer_delegate.h - Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr

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: content/browser/web_contents/aura/shadow_layer_delegate.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

« no previous file with comments | « content/browser/web_contents/aura/overscroll_window_delegate_unittest.cc ('k') | content/browser/web_contents/web_contents_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/aura/shadow_layer_delegate.h

diff --git a/content/browser/web_contents/aura/shadow_layer_delegate.h b/content/browser/web_contents/aura/shadow_layer_delegate.h

index 3f4775913805dda9c2c809e045c348fa6a9fd902..6c1729f3e537b1c5215212b5d4784f6cc5688ba8 100644

--- a/content/browser/web_contents/aura/shadow_layer_delegate.h

+++ b/content/browser/web_contents/aura/shadow_layer_delegate.h

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

#ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_SHADOW_LAYER_DELEGATE_H_

#define CONTENT_BROWSER_WEB_CONTENTS_AURA_SHADOW_LAYER_DELEGATE_H_

+#include <memory>

#include "base/compiler_specific.h"

#include "base/macros.h"

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

#include "ui/compositor/layer_delegate.h"

namespace aura {

@@ -38,7 +39,7 @@ class ShadowLayerDelegate : public ui::LayerDelegate {

void OnDeviceScaleFactorChanged(float device_scale_factor) override;

base::Closure PrepareForLayerBoundsChange() override;

- scoped_ptr<ui::Layer> layer_;

+ std::unique_ptr<ui::Layer> layer_;

DISALLOW_COPY_AND_ASSIGN(ShadowLayerDelegate);

};