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

Side by Side Diff: ash/mus/frame/caption_buttons/frame_caption_button_container_view.h

Issue 2029883002: Moves mash/wm into ash/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_static_assert
Patch Set: move comment Created 4 years, 6 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ 5 #ifndef ASH_MUS_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
6 #define MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ 6 #define ASH_MUS_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
11 #include "ash/mus/frame/caption_buttons/caption_button_types.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "mash/wm/frame/caption_buttons/caption_button_types.h"
13 #include "ui/gfx/animation/animation_delegate.h" 13 #include "ui/gfx/animation/animation_delegate.h"
14 #include "ui/views/controls/button/button.h" 14 #include "ui/views/controls/button/button.h"
15 #include "ui/views/view.h" 15 #include "ui/views/view.h"
16 16
17 namespace gfx { 17 namespace gfx {
18 class SlideAnimation; 18 class SlideAnimation;
19 } 19 }
20 20
21 namespace views { 21 namespace views {
22 class Widget; 22 class Widget;
23 } 23 }
24 24
25 namespace mash { 25 namespace ash {
26 namespace wm { 26 namespace mus {
27 27
28 class FrameCaptionButton; 28 class FrameCaptionButton;
29 29
30 // Container view for the frame caption buttons. It performs the appropriate 30 // Container view for the frame caption buttons. It performs the appropriate
31 // action when a caption button is clicked. 31 // action when a caption button is clicked.
32 class FrameCaptionButtonContainerView : public views::View, 32 class FrameCaptionButtonContainerView : public views::View,
33 public views::ButtonListener, 33 public views::ButtonListener,
34 public gfx::AnimationDelegate { 34 public gfx::AnimationDelegate {
35 public: 35 public:
36 enum Animate { ANIMATE_YES, ANIMATE_NO }; 36 enum Animate { ANIMATE_YES, ANIMATE_NO };
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 // CaptionButtonIcon. 123 // CaptionButtonIcon.
124 std::map<CaptionButtonIcon, ButtonIconIds> button_icon_id_map_; 124 std::map<CaptionButtonIcon, ButtonIconIds> button_icon_id_map_;
125 125
126 // Animation that affects the position of |minimize_button_| and the 126 // Animation that affects the position of |minimize_button_| and the
127 // visibility of |size_button_|. 127 // visibility of |size_button_|.
128 std::unique_ptr<gfx::SlideAnimation> maximize_mode_animation_; 128 std::unique_ptr<gfx::SlideAnimation> maximize_mode_animation_;
129 129
130 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView); 130 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView);
131 }; 131 };
132 132
133 } // namespace wm 133 } // namespace mus
134 } // namespace mash 134 } // namespace ash
135 135
136 #endif // MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_ 136 #endif // ASH_MUS_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698