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

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

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years 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
« no previous file with comments | « ash/focus_cycler.h ('k') | ash/frame/caption_buttons/frame_caption_button_container_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ 5 #ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
6 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ 6 #define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/frame/caption_buttons/caption_button_types.h" 9 #include "ash/frame/caption_buttons/caption_button_types.h"
10 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
11 #include "ui/gfx/image/image_skia.h" 12 #include "ui/gfx/image/image_skia.h"
12 #include "ui/views/controls/button/custom_button.h" 13 #include "ui/views/controls/button/custom_button.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 class SlideAnimation; 16 class SlideAnimation;
16 } 17 }
17 18
18 namespace ash { 19 namespace ash {
19 20
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // Crossfade animation started when the button's images are changed by 97 // Crossfade animation started when the button's images are changed by
97 // SetImages(). 98 // SetImages().
98 scoped_ptr<gfx::SlideAnimation> swap_images_animation_; 99 scoped_ptr<gfx::SlideAnimation> swap_images_animation_;
99 100
100 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton); 101 DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton);
101 }; 102 };
102 103
103 } // namespace ash 104 } // namespace ash
104 105
105 #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_ 106 #endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
OLDNEW
« no previous file with comments | « ash/focus_cycler.h ('k') | ash/frame/caption_buttons/frame_caption_button_container_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698