OLD | NEW |
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 #include "ash/wm/custom_frame_view_ash.h" | 5 #include "ash/wm/custom_frame_view_ash.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h" | 8 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h" |
9 #include "ash/wm/caption_buttons/frame_maximize_button.h" | 9 #include "ash/wm/caption_buttons/frame_maximize_button.h" |
10 #include "ash/wm/caption_buttons/frame_maximize_button_observer.h" | 10 #include "ash/wm/caption_buttons/frame_maximize_button_observer.h" |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
280 header_mode, | 280 header_mode, |
281 theme_image_id, | 281 theme_image_id, |
282 0); | 282 0); |
283 header_painter_->PaintTitleBar(canvas, GetTitleFontList()); | 283 header_painter_->PaintTitleBar(canvas, GetTitleFontList()); |
284 header_painter_->PaintHeaderContentSeparator(canvas, header_mode); | 284 header_painter_->PaintHeaderContentSeparator(canvas, header_mode); |
285 } | 285 } |
286 | 286 |
287 void CustomFrameViewAsh::HeaderView::OnImmersiveRevealStarted() { | 287 void CustomFrameViewAsh::HeaderView::OnImmersiveRevealStarted() { |
288 fullscreen_visible_fraction_ = 0; | 288 fullscreen_visible_fraction_ = 0; |
289 SetPaintToLayer(true); | 289 SetPaintToLayer(true); |
| 290 SetFillsBoundsOpaquely(false); |
290 parent()->Layout(); | 291 parent()->Layout(); |
291 } | 292 } |
292 | 293 |
293 void CustomFrameViewAsh::HeaderView::OnImmersiveRevealEnded() { | 294 void CustomFrameViewAsh::HeaderView::OnImmersiveRevealEnded() { |
294 fullscreen_visible_fraction_ = 0; | 295 fullscreen_visible_fraction_ = 0; |
295 SetPaintToLayer(false); | 296 SetPaintToLayer(false); |
296 parent()->Layout(); | 297 parent()->Layout(); |
297 } | 298 } |
298 | 299 |
299 void CustomFrameViewAsh::HeaderView::OnImmersiveFullscreenExited() { | 300 void CustomFrameViewAsh::HeaderView::OnImmersiveFullscreenExited() { |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
501 } | 502 } |
502 | 503 |
503 //////////////////////////////////////////////////////////////////////////////// | 504 //////////////////////////////////////////////////////////////////////////////// |
504 // CustomFrameViewAsh, private: | 505 // CustomFrameViewAsh, private: |
505 | 506 |
506 int CustomFrameViewAsh::NonClientTopBorderHeight() const { | 507 int CustomFrameViewAsh::NonClientTopBorderHeight() const { |
507 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight(); | 508 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight(); |
508 } | 509 } |
509 | 510 |
510 } // namespace ash | 511 } // namespace ash |
OLD | NEW |