mash/wm/frame/caption_buttons/frame_caption_button.h - Issue 1857623003: convert //mash 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: mash/wm/frame/caption_buttons/frame_caption_button.h

Issue 1857623003: convert //mash to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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:

Index: mash/wm/frame/caption_buttons/frame_caption_button.h

diff --git a/mash/wm/frame/caption_buttons/frame_caption_button.h b/mash/wm/frame/caption_buttons/frame_caption_button.h

index 6708327507f24ea3716406831d619b6d8dd8d20d..9f816072431771c7a2e92a99d0ca0a7f36478ae7 100644

--- a/mash/wm/frame/caption_buttons/frame_caption_button.h

+++ b/mash/wm/frame/caption_buttons/frame_caption_button.h

@@ -5,8 +5,9 @@

#ifndef MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_

#define MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_

+#include <memory>

#include "base/macros.h"

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

#include "mash/wm/frame/caption_buttons/caption_button_types.h"

#include "ui/gfx/image/image_skia.h"

#include "ui/views/controls/button/custom_button.h"

@@ -91,7 +92,7 @@ class FrameCaptionButton : public views::CustomButton {

// Crossfade animation started when the button's images are changed by

// SetImages().

- scoped_ptr<gfx::SlideAnimation> swap_images_animation_;

+ std::unique_ptr<gfx::SlideAnimation> swap_images_animation_;

DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton);

};