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

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

Issue 2734653002: chromeos: Move files in //ash/common to //ash (Closed)
Patch Set: fix a11y tests, fix docs Created 3 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:
View unified diff | Download patch
OLDNEW
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_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ 5 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
6 #define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ 6 #define ASH_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/common/frame/caption_buttons/caption_button_types.h" 11 #include "ash/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 struct VectorIcon; 18 struct VectorIcon;
19 } 19 }
20 20
21 namespace ash { 21 namespace ash {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 // Crossfade animation started when the button's images are changed by 97 // Crossfade animation started when the button's images are changed by
98 // SetImage(). 98 // SetImage().
99 std::unique_ptr<gfx::SlideAnimation> swap_images_animation_; 99 std::unique_ptr<gfx::SlideAnimation> swap_images_animation_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton); 101 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton);
102 }; 102 };
103 103
104 } // namespace ash 104 } // namespace ash
105 105
106 #endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ 106 #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
OLDNEW
« no previous file with comments | « ash/frame/caption_buttons/caption_button_types.h ('k') | ash/frame/caption_buttons/frame_caption_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698