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

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

Issue 2798333005: Moves WmWindow::GetInternalWidget() into a standalone function (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « ash/wm/widget_finder.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/wm/widget_finder.h"
9 #include "ash/wm/window_state_aura.h" 10 #include "ash/wm/window_state_aura.h"
10 #include "ui/aura/client/aura_constants.h" 11 #include "ui/aura/client/aura_constants.h"
11 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
12 #include "ui/compositor/layer.h" 13 #include "ui/compositor/layer.h"
13 #include "ui/compositor/layer_tree_owner.h" 14 #include "ui/compositor/layer_tree_owner.h"
14 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
15 #include "ui/wm/core/window_util.h" 16 #include "ui/wm/core/window_util.h"
16 17
17 namespace ash { 18 namespace ash {
18 namespace wm { 19 namespace wm {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 } 105 }
105 106
106 gfx::Rect WindowMirrorView::GetClientAreaBounds() const { 107 gfx::Rect WindowMirrorView::GetClientAreaBounds() const {
107 int insets = target_->aura_window()->GetProperty(aura::client::kTopViewInset); 108 int insets = target_->aura_window()->GetProperty(aura::client::kTopViewInset);
108 if (insets > 0) { 109 if (insets > 0) {
109 gfx::Rect bounds(target_->GetBounds().size()); 110 gfx::Rect bounds(target_->GetBounds().size());
110 bounds.Inset(0, insets, 0, 0); 111 bounds.Inset(0, insets, 0, 0);
111 return bounds; 112 return bounds;
112 } 113 }
113 // The target window may not have a widget in unit tests. 114 // The target window may not have a widget in unit tests.
114 if (!target_->GetInternalWidget()) 115 views::Widget* widget = GetInternalWidgetForWindow(target_->aura_window());
116 if (!widget)
115 return gfx::Rect(); 117 return gfx::Rect();
116 views::View* client_view = target_->GetInternalWidget()->client_view(); 118 views::View* client_view = widget->client_view();
117 return client_view->ConvertRectToWidget(client_view->GetLocalBounds()); 119 return client_view->ConvertRectToWidget(client_view->GetLocalBounds());
118 } 120 }
119 121
120 } // namespace wm 122 } // namespace wm
121 } // namespace ash 123 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/widget_finder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698