OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "ash/common/frame/header_view.h" | 5 #include "ash/common/frame/header_view.h" |
6 | 6 |
7 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h
" | 7 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h
" |
8 #include "ash/common/frame/default_header_painter.h" | 8 #include "ash/common/frame/default_header_painter.h" |
9 #include "ash/common/session/session_state_delegate.h" | 9 #include "ash/common/session/session_state_delegate.h" |
10 #include "ash/common/wm_lookup.h" | 10 #include "ash/common/wm_lookup.h" |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 return avatar_icon_; | 158 return avatar_icon_; |
159 } | 159 } |
160 | 160 |
161 /////////////////////////////////////////////////////////////////////////////// | 161 /////////////////////////////////////////////////////////////////////////////// |
162 // HeaderView, | 162 // HeaderView, |
163 // ImmersiveFullscreenControllerDelegate overrides: | 163 // ImmersiveFullscreenControllerDelegate overrides: |
164 | 164 |
165 void HeaderView::OnImmersiveRevealStarted() { | 165 void HeaderView::OnImmersiveRevealStarted() { |
166 fullscreen_visible_fraction_ = 0; | 166 fullscreen_visible_fraction_ = 0; |
167 SetPaintToLayer(); | 167 SetPaintToLayer(); |
168 layer()->SetFillsBoundsOpaquely(false); | |
169 parent()->Layout(); | 168 parent()->Layout(); |
170 } | 169 } |
171 | 170 |
172 void HeaderView::OnImmersiveRevealEnded() { | 171 void HeaderView::OnImmersiveRevealEnded() { |
173 fullscreen_visible_fraction_ = 0; | 172 fullscreen_visible_fraction_ = 0; |
174 DestroyLayer(); | 173 DestroyLayer(); |
175 parent()->Layout(); | 174 parent()->Layout(); |
176 } | 175 } |
177 | 176 |
178 void HeaderView::OnImmersiveFullscreenExited() { | 177 void HeaderView::OnImmersiveFullscreenExited() { |
(...skipping 14 matching lines...) Expand all Loading... |
193 gfx::Rect visible_bounds(GetVisibleBounds()); | 192 gfx::Rect visible_bounds(GetVisibleBounds()); |
194 gfx::Point visible_origin_in_screen(visible_bounds.origin()); | 193 gfx::Point visible_origin_in_screen(visible_bounds.origin()); |
195 views::View::ConvertPointToScreen(this, &visible_origin_in_screen); | 194 views::View::ConvertPointToScreen(this, &visible_origin_in_screen); |
196 std::vector<gfx::Rect> bounds_in_screen; | 195 std::vector<gfx::Rect> bounds_in_screen; |
197 bounds_in_screen.push_back( | 196 bounds_in_screen.push_back( |
198 gfx::Rect(visible_origin_in_screen, visible_bounds.size())); | 197 gfx::Rect(visible_origin_in_screen, visible_bounds.size())); |
199 return bounds_in_screen; | 198 return bounds_in_screen; |
200 } | 199 } |
201 | 200 |
202 } // namespace ash | 201 } // namespace ash |
OLD | NEW |