Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(231)

Unified Diff: ash/common/wm/panels/panel_frame_view.cc

Issue 2731663002: Remove WmWindowProperty (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 6161d8c21c196729d453f064e6197d264141d39c..337ff1521d4705e050133bb791ed3c4d234ba5b4 100644
--- a/ash/common/wm/panels/panel_frame_view.cc
+++ b/ash/common/wm/panels/panel_frame_view.cc
@@ -10,7 +10,8 @@
#include "ash/common/wm_lookup.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"
@@ -38,8 +39,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 {
@@ -48,8 +49,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_);
@@ -86,8 +87,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*) {

Powered by Google App Engine
This is Rietveld 408576698