ash/common/frame/caption_buttons/frame_caption_button.h - Issue 2215223003: Moves most frame related classes to ash/common/frame

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ash/common/frame/caption_buttons/frame_caption_button.h

Issue 2215223003: Moves most frame related classes to ash/common/frame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: comment Created 4 years, 4 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_	5 #ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_

6 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_	6 #define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_

7	7

8 #include <memory>	8 #include <memory>

9	9

10 #include "ash/ash_export.h"	10 #include "ash/ash_export.h"

11 #include "ash/frame/caption_buttons/caption_button_types.h"	11 #include "ash/common/frame/caption_buttons/caption_button_types.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

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

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

15	15

16 namespace gfx {	16 namespace gfx {

17 class SlideAnimation;	17 class SlideAnimation;

18 enum class VectorIconId;	18 enum class VectorIconId;

19 }	19 }

20	20

21 namespace ash {	21 namespace ash {

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
98	98

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

100 // SetImage().	100 // SetImage().

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

102	102

103 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton);	103 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton);

104 };	104 };

105	105

106 } // namespace ash	106 } // namespace ash

107	107

108 #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_	108 #endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_

OLD	NEW