OLD | NEW |
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 #include "chrome/browser/ui/views/frame/top_container_view.h" | 5 #include "chrome/browser/ui/views/frame/top_container_view.h" |
6 | 6 |
7 #include "chrome/browser/ui/views/frame/browser_frame.h" | 7 #include "chrome/browser/ui/views/frame/browser_frame.h" |
8 #include "chrome/browser/ui/views/frame/browser_view.h" | 8 #include "chrome/browser/ui/views/frame/browser_view.h" |
9 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 9 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
10 #include "ui/compositor/paint_context.h" | 10 #include "ui/views/paint_info.h" |
11 | 11 |
12 TopContainerView::TopContainerView(BrowserView* browser_view) | 12 TopContainerView::TopContainerView(BrowserView* browser_view) |
13 : browser_view_(browser_view) { | 13 : browser_view_(browser_view) { |
14 } | 14 } |
15 | 15 |
16 TopContainerView::~TopContainerView() { | 16 TopContainerView::~TopContainerView() { |
17 } | 17 } |
18 | 18 |
19 const char* TopContainerView::GetClassName() const { | 19 const char* TopContainerView::GetClassName() const { |
20 return "TopContainerView"; | 20 return "TopContainerView"; |
21 } | 21 } |
22 | 22 |
23 void TopContainerView::PaintChildren(const ui::PaintContext& context) { | 23 void TopContainerView::PaintChildren(const views::PaintInfo& paint_info) { |
24 if (browser_view_->immersive_mode_controller()->IsRevealed()) { | 24 if (browser_view_->immersive_mode_controller()->IsRevealed()) { |
25 // Top-views depend on parts of the frame (themes, window title, window | 25 // Top-views depend on parts of the frame (themes, window title, window |
26 // controls) being painted underneath them. Clip rect has already been set | 26 // controls) being painted underneath them. Clip rect has already been set |
27 // to the bounds of this view, so just paint the frame. Use a clone without | 27 // to the bounds of this view, so just paint the frame. Use a clone without |
28 // invalidation info, as we're painting something outside of the normal | 28 // invalidation info, as we're painting something outside of the normal |
29 // parent-child relationship, so invalidations are no longer in the correct | 29 // parent-child relationship, so invalidations are no longer in the correct |
30 // space to compare. | 30 // space to compare. |
31 browser_view_->frame()->GetFrameView()->Paint(ui::PaintContext( | 31 browser_view_->frame()->GetFrameView()->Paint( |
32 context, ui::PaintContext::CLONE_WITHOUT_INVALIDATION)); | 32 views::PaintInfo::ClonePaintInfo(paint_info)); |
33 } | 33 } |
34 View::PaintChildren(context); | 34 View::PaintChildren(paint_info); |
35 } | 35 } |
36 | 36 |
37 void TopContainerView::ChildPreferredSizeChanged(views::View* child) { | 37 void TopContainerView::ChildPreferredSizeChanged(views::View* child) { |
38 PreferredSizeChanged(); | 38 PreferredSizeChanged(); |
39 } | 39 } |
OLD | NEW |