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

Side by Side Diff: ash/common/wm/overview/scoped_transform_overview_window.h

Issue 2148703002: [ash-md] Fixes a bug with setting window shape to mask header in overview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: [ash-md] Fixes a bug with setting window shape to mask header in overview (rebased) Created 4 years, 5 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
« no previous file with comments | « no previous file | ash/common/wm/overview/scoped_transform_overview_window.cc » ('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_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_ 5 #ifndef ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
6 #define ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_ 6 #define ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 // A weak pointer to the real window in the overview. 134 // A weak pointer to the real window in the overview.
135 WmWindow* window_; 135 WmWindow* window_;
136 136
137 // Mask layer that hides the original window header. 137 // Mask layer that hides the original window header.
138 std::unique_ptr<OverviewContentMask> mask_; 138 std::unique_ptr<OverviewContentMask> mask_;
139 139
140 // Original window shape, if it was set on a window. 140 // Original window shape, if it was set on a window.
141 std::unique_ptr<SkRegion> original_window_shape_; 141 std::unique_ptr<SkRegion> original_window_shape_;
142 142
143 // True after the |original_window_shape_| has been set or after it has
144 // been determined that window shape was not originally set on the |window_|.
145 bool determined_original_window_shape_;
146
143 // If true, the window was minimized and should be restored if the window 147 // If true, the window was minimized and should be restored if the window
144 // was not selected. 148 // was not selected.
145 bool minimized_; 149 bool minimized_;
146 150
147 // Tracks if this window was ignored by the shelf. 151 // Tracks if this window was ignored by the shelf.
148 bool ignored_by_shelf_; 152 bool ignored_by_shelf_;
149 153
150 // True if the window has been transformed for overview mode. 154 // True if the window has been transformed for overview mode.
151 bool overview_started_; 155 bool overview_started_;
152 156
153 // The original transform of the window before entering overview mode. 157 // The original transform of the window before entering overview mode.
154 gfx::Transform original_transform_; 158 gfx::Transform original_transform_;
155 159
156 // Keeps track of the original transform used when |this| has been positioned 160 // Keeps track of the original transform used when |this| has been positioned
157 // during SelectorItem layout. 161 // during SelectorItem layout.
158 gfx::Transform overview_transform_; 162 gfx::Transform overview_transform_;
159 163
160 // The original opacity of the window before entering overview mode. 164 // The original opacity of the window before entering overview mode.
161 float original_opacity_; 165 float original_opacity_;
162 166
163 base::WeakPtrFactory<ScopedTransformOverviewWindow> weak_ptr_factory_; 167 base::WeakPtrFactory<ScopedTransformOverviewWindow> weak_ptr_factory_;
164 168
165 DISALLOW_COPY_AND_ASSIGN(ScopedTransformOverviewWindow); 169 DISALLOW_COPY_AND_ASSIGN(ScopedTransformOverviewWindow);
166 }; 170 };
167 171
168 } // namespace ash 172 } // namespace ash
169 173
170 #endif // ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_ 174 #endif // ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/wm/overview/scoped_transform_overview_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698