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

Side by Side Diff: ash/wm/frame_painter.h

Issue 11194015: Fix crash bugs of FramePainter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/wm/frame_painter.cc » ('j') | ash/wm/frame_painter_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WM_FRAME_PAINTER_H_ 5 #ifndef ASH_WM_FRAME_PAINTER_H_
6 #define ASH_WM_FRAME_PAINTER_H_ 6 #define ASH_WM_FRAME_PAINTER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 const gfx::Rect& old_bounds, 127 const gfx::Rect& old_bounds,
128 const gfx::Rect& new_bounds) OVERRIDE; 128 const gfx::Rect& new_bounds) OVERRIDE;
129 virtual void OnWindowAddedToRootWindow(aura::Window* window) OVERRIDE; 129 virtual void OnWindowAddedToRootWindow(aura::Window* window) OVERRIDE;
130 virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE; 130 virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE;
131 131
132 // Overridden from ui::AnimationDelegate 132 // Overridden from ui::AnimationDelegate
133 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; 133 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
134 134
135 private: 135 private:
136 FRIEND_TEST_ALL_PREFIXES(FramePainterTest, Basics); 136 FRIEND_TEST_ALL_PREFIXES(FramePainterTest, Basics);
137 FRIEND_TEST_ALL_PREFIXES(FramePainterTest, CreateAndDeleteSingleWindow);
137 FRIEND_TEST_ALL_PREFIXES(FramePainterTest, UseSoloWindowHeader); 138 FRIEND_TEST_ALL_PREFIXES(FramePainterTest, UseSoloWindowHeader);
138 FRIEND_TEST_ALL_PREFIXES(FramePainterTest, UseSoloWindowHeaderMultiDisplay); 139 FRIEND_TEST_ALL_PREFIXES(FramePainterTest, UseSoloWindowHeaderMultiDisplay);
139 FRIEND_TEST_ALL_PREFIXES(FramePainterTest, GetHeaderOpacity); 140 FRIEND_TEST_ALL_PREFIXES(FramePainterTest, GetHeaderOpacity);
140 141
141 // Sets the images for a button base on IDs from the |frame_| theme provider. 142 // Sets the images for a button base on IDs from the |frame_| theme provider.
142 void SetButtonImages(views::ImageButton* button, 143 void SetButtonImages(views::ImageButton* button,
143 int normal_image_id, 144 int normal_image_id,
144 int hot_image_id, 145 int hot_image_id,
145 int pushed_image_id); 146 int pushed_image_id);
146 147
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 scoped_ptr<ui::SlideAnimation> crossfade_animation_; 211 scoped_ptr<ui::SlideAnimation> crossfade_animation_;
211 212
212 SizeButtonBehavior size_button_behavior_; 213 SizeButtonBehavior size_button_behavior_;
213 214
214 DISALLOW_COPY_AND_ASSIGN(FramePainter); 215 DISALLOW_COPY_AND_ASSIGN(FramePainter);
215 }; 216 };
216 217
217 } // namespace ash 218 } // namespace ash
218 219
219 #endif // ASH_WM_FRAME_PAINTER_H_ 220 #endif // ASH_WM_FRAME_PAINTER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/wm/frame_painter.cc » ('j') | ash/wm/frame_painter_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698