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

Side by Side Diff: ash/wm/window_mirror_view.cc

Issue 2731663002: Remove WmWindowProperty (Closed)
Patch Set: rebase Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/window_mirror_view.h" 5 #include "ash/wm/window_mirror_view.h"
6 6
7 #include "ash/common/wm/window_state.h" 7 #include "ash/common/wm/window_state.h"
8 #include "ash/common/wm_window.h" 8 #include "ash/common/wm_window.h"
9 #include "ash/common/wm_window_property.h"
10 #include "ash/wm/window_state_aura.h" 9 #include "ash/wm/window_state_aura.h"
11 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
12 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
13 #include "ui/compositor/layer.h" 12 #include "ui/compositor/layer.h"
14 #include "ui/compositor/layer_tree_owner.h" 13 #include "ui/compositor/layer_tree_owner.h"
15 #include "ui/views/widget/widget.h" 14 #include "ui/views/widget/widget.h"
16 #include "ui/wm/core/window_util.h" 15 #include "ui/wm/core/window_util.h"
17 16
18 namespace ash { 17 namespace ash {
19 namespace wm { 18 namespace wm {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 } 97 }
99 98
100 Layout(); 99 Layout();
101 } 100 }
102 101
103 ui::Layer* WindowMirrorView::GetMirrorLayer() { 102 ui::Layer* WindowMirrorView::GetMirrorLayer() {
104 return layer_owner_->root(); 103 return layer_owner_->root();
105 } 104 }
106 105
107 gfx::Rect WindowMirrorView::GetClientAreaBounds() const { 106 gfx::Rect WindowMirrorView::GetClientAreaBounds() const {
108 int insets = target_->GetIntProperty(WmWindowProperty::TOP_VIEW_INSET); 107 int insets = target_->aura_window()->GetProperty(aura::client::kTopViewInset);
109 if (insets > 0) { 108 if (insets > 0) {
110 gfx::Rect bounds(target_->GetBounds().size()); 109 gfx::Rect bounds(target_->GetBounds().size());
111 bounds.Inset(0, insets, 0, 0); 110 bounds.Inset(0, insets, 0, 0);
112 return bounds; 111 return bounds;
113 } 112 }
114 // The target window may not have a widget in unit tests. 113 // The target window may not have a widget in unit tests.
115 if (!target_->GetInternalWidget()) 114 if (!target_->GetInternalWidget())
116 return gfx::Rect(); 115 return gfx::Rect();
117 views::View* client_view = target_->GetInternalWidget()->client_view(); 116 views::View* client_view = target_->GetInternalWidget()->client_view();
118 return client_view->ConvertRectToWidget(client_view->GetLocalBounds()); 117 return client_view->ConvertRectToWidget(client_view->GetLocalBounds());
119 } 118 }
120 119
121 } // namespace wm 120 } // namespace wm
122 } // namespace ash 121 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698