| 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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 int theme_image_id = 0; | 272 int theme_image_id = 0; |
| 273 if (frame_->IsMaximized() || frame_->IsFullscreen()) | 273 if (frame_->IsMaximized() || frame_->IsFullscreen()) |
| 274 theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_MINIMAL; | 274 theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_MINIMAL; |
| 275 else if (paint_as_active_) | 275 else if (paint_as_active_) |
| 276 theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_ACTIVE; | 276 theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_ACTIVE; |
| 277 else | 277 else |
| 278 theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_INACTIVE; | 278 theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_INACTIVE; |
| 279 | 279 |
| 280 header_painter_->PaintHeader( | 280 header_painter_->PaintHeader( |
| 281 canvas, | 281 canvas, |
| 282 paint_as_active_ ? HeaderPainter::ACTIVE : HeaderPainter::INACTIVE, | |
| 283 theme_image_id, | 282 theme_image_id, |
| 284 0); | 283 0); |
| 285 header_painter_->PaintTitleBar(canvas, GetTitleFont()); | 284 header_painter_->PaintTitleBar(canvas, GetTitleFont()); |
| 286 header_painter_->PaintHeaderContentSeparator(canvas); | 285 header_painter_->PaintHeaderContentSeparator(canvas); |
| 287 } | 286 } |
| 288 | 287 |
| 289 void CustomFrameViewAsh::HeaderView::OnImmersiveRevealStarted() { | 288 void CustomFrameViewAsh::HeaderView::OnImmersiveRevealStarted() { |
| 290 fullscreen_visible_fraction_ = 0; | 289 fullscreen_visible_fraction_ = 0; |
| 291 SetPaintToLayer(true); | 290 SetPaintToLayer(true); |
| 292 parent()->Layout(); | 291 parent()->Layout(); |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 } | 492 } |
| 494 | 493 |
| 495 //////////////////////////////////////////////////////////////////////////////// | 494 //////////////////////////////////////////////////////////////////////////////// |
| 496 // CustomFrameViewAsh, private: | 495 // CustomFrameViewAsh, private: |
| 497 | 496 |
| 498 int CustomFrameViewAsh::NonClientTopBorderHeight() const { | 497 int CustomFrameViewAsh::NonClientTopBorderHeight() const { |
| 499 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight(); | 498 return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight(); |
| 500 } | 499 } |
| 501 | 500 |
| 502 } // namespace ash | 501 } // namespace ash |
| OLD | NEW |