| Index: ash/common/wm/panels/panel_frame_view.cc
|
| diff --git a/ash/common/wm/panels/panel_frame_view.cc b/ash/common/wm/panels/panel_frame_view.cc
|
| index b2fdbce237c0f3fd291735408c2302a599f19133..67ef90cf79e7df702b80d7bdecdc5de0f4b5561f 100644
|
| --- a/ash/common/wm/panels/panel_frame_view.cc
|
| +++ b/ash/common/wm/panels/panel_frame_view.cc
|
| @@ -9,7 +9,8 @@
|
| #include "ash/common/frame/frame_border_hit_test.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| -#include "ash/common/wm_window_property.h"
|
| +#include "ui/aura/client/aura_constants.h"
|
| +#include "ui/aura/window.h"
|
| #include "ui/base/hit_test.h"
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/views/controls/image_view.h"
|
| @@ -37,8 +38,8 @@ PanelFrameView::~PanelFrameView() {
|
| void PanelFrameView::SetFrameColors(SkColor active_frame_color,
|
| SkColor inactive_frame_color) {
|
| header_painter_->SetFrameColors(active_frame_color, inactive_frame_color);
|
| - GetWidgetWindow()->SetColorProperty(WmWindowProperty::TOP_VIEW_COLOR,
|
| - header_painter_->GetInactiveFrameColor());
|
| + GetWidgetWindow()->aura_window()->SetProperty(
|
| + aura::client::kTopViewColor, header_painter_->GetInactiveFrameColor());
|
| }
|
|
|
| const char* PanelFrameView::GetClassName() const {
|
| @@ -47,8 +48,8 @@ const char* PanelFrameView::GetClassName() const {
|
|
|
| void PanelFrameView::InitHeaderPainter() {
|
| header_painter_.reset(new DefaultHeaderPainter);
|
| - GetWidgetWindow()->SetColorProperty(WmWindowProperty::TOP_VIEW_COLOR,
|
| - header_painter_->GetInactiveFrameColor());
|
| + GetWidgetWindow()->aura_window()->SetProperty(
|
| + aura::client::kTopViewColor, header_painter_->GetInactiveFrameColor());
|
|
|
| caption_button_container_ = new FrameCaptionButtonContainerView(frame_);
|
| AddChildView(caption_button_container_);
|
| @@ -85,8 +86,8 @@ void PanelFrameView::Layout() {
|
| if (!header_painter_)
|
| return;
|
| header_painter_->LayoutHeader();
|
| - GetWidgetWindow()->SetIntProperty(WmWindowProperty::TOP_VIEW_INSET,
|
| - NonClientTopBorderHeight());
|
| + GetWidgetWindow()->aura_window()->SetProperty(aura::client::kTopViewInset,
|
| + NonClientTopBorderHeight());
|
| }
|
|
|
| void PanelFrameView::GetWindowMask(const gfx::Size&, gfx::Path*) {
|
|
|