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

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

Issue 2901503003: Rename GetPreferredSize to CalculatePreferredSize in ash/ (Closed)
Patch Set: improvements Created 3 years, 7 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/window_mirror_view.h ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | 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/wm/widget_finder.h" 7 #include "ash/wm/widget_finder.h"
8 #include "ash/wm/window_state.h" 8 #include "ash/wm/window_state.h"
9 #include "ash/wm_window.h" 9 #include "ash/wm_window.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 24 matching lines...) Expand all
35 DCHECK(window); 35 DCHECK(window);
36 } 36 }
37 37
38 WindowMirrorView::~WindowMirrorView() { 38 WindowMirrorView::~WindowMirrorView() {
39 // Make sure |target_| has outlived |this|. See crbug.com/681207 39 // Make sure |target_| has outlived |this|. See crbug.com/681207
40 DCHECK(target_->layer()); 40 DCHECK(target_->layer());
41 if (layer_owner_) 41 if (layer_owner_)
42 target_->ClearProperty(aura::client::kMirroringEnabledKey); 42 target_->ClearProperty(aura::client::kMirroringEnabledKey);
43 } 43 }
44 44
45 gfx::Size WindowMirrorView::GetPreferredSize() const { 45 gfx::Size WindowMirrorView::CalculatePreferredSize() const {
46 return GetClientAreaBounds().size(); 46 return GetClientAreaBounds().size();
47 } 47 }
48 48
49 void WindowMirrorView::Layout() { 49 void WindowMirrorView::Layout() {
50 // If |layer_owner_| hasn't been initialized (|this| isn't on screen), no-op. 50 // If |layer_owner_| hasn't been initialized (|this| isn't on screen), no-op.
51 if (!layer_owner_) 51 if (!layer_owner_)
52 return; 52 return;
53 53
54 // Position at 0, 0. 54 // Position at 0, 0.
55 GetMirrorLayer()->SetBounds(gfx::Rect(GetMirrorLayer()->bounds().size())); 55 GetMirrorLayer()->SetBounds(gfx::Rect(GetMirrorLayer()->bounds().size()));
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // The target window may not have a widget in unit tests. 110 // The target window may not have a widget in unit tests.
111 views::Widget* widget = GetInternalWidgetForWindow(target_); 111 views::Widget* widget = GetInternalWidgetForWindow(target_);
112 if (!widget) 112 if (!widget)
113 return gfx::Rect(); 113 return gfx::Rect();
114 views::View* client_view = widget->client_view(); 114 views::View* client_view = widget->client_view();
115 return client_view->ConvertRectToWidget(client_view->GetLocalBounds()); 115 return client_view->ConvertRectToWidget(client_view->GetLocalBounds());
116 } 116 }
117 117
118 } // namespace wm 118 } // namespace wm
119 } // namespace ash 119 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_mirror_view.h ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698