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

Side by Side Diff: ash/aura/aura_layout_manager_adapter.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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/app_list/app_list_presenter_delegate.cc ('k') | ash/aura/wm_lookup_aura.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/aura/aura_layout_manager_adapter.h" 5 #include "ash/aura/aura_layout_manager_adapter.h"
6 6
7 #include "ash/aura/wm_window_aura.h"
8 #include "ash/common/wm_layout_manager.h" 7 #include "ash/common/wm_layout_manager.h"
8 #include "ash/common/wm_window.h"
9 #include "ui/aura/window_property.h" 9 #include "ui/aura/window_property.h"
10 10
11 DECLARE_WINDOW_PROPERTY_TYPE(ash::AuraLayoutManagerAdapter*); 11 DECLARE_WINDOW_PROPERTY_TYPE(ash::AuraLayoutManagerAdapter*);
12 12
13 namespace ash { 13 namespace ash {
14 namespace { 14 namespace {
15 // AuraLayoutManagerAdapter is an aura::LayoutManager, so it's owned by the 15 // AuraLayoutManagerAdapter is an aura::LayoutManager, so it's owned by the
16 // aura::Window it is installed on. This property is used to lookup the 16 // aura::Window it is installed on. This property is used to lookup the
17 // AuraLayoutManagerAdapter given only an aura::Window. 17 // AuraLayoutManagerAdapter given only an aura::Window.
18 DEFINE_WINDOW_PROPERTY_KEY(AuraLayoutManagerAdapter*, 18 DEFINE_WINDOW_PROPERTY_KEY(AuraLayoutManagerAdapter*,
(...skipping 18 matching lines...) Expand all
37 // static 37 // static
38 AuraLayoutManagerAdapter* AuraLayoutManagerAdapter::Get(aura::Window* window) { 38 AuraLayoutManagerAdapter* AuraLayoutManagerAdapter::Get(aura::Window* window) {
39 return window->GetProperty(kAuraLayoutManagerAdapter); 39 return window->GetProperty(kAuraLayoutManagerAdapter);
40 } 40 }
41 41
42 void AuraLayoutManagerAdapter::OnWindowResized() { 42 void AuraLayoutManagerAdapter::OnWindowResized() {
43 wm_layout_manager_->OnWindowResized(); 43 wm_layout_manager_->OnWindowResized();
44 } 44 }
45 45
46 void AuraLayoutManagerAdapter::OnWindowAddedToLayout(aura::Window* child) { 46 void AuraLayoutManagerAdapter::OnWindowAddedToLayout(aura::Window* child) {
47 wm_layout_manager_->OnWindowAddedToLayout(WmWindowAura::Get(child)); 47 wm_layout_manager_->OnWindowAddedToLayout(WmWindow::Get(child));
48 } 48 }
49 49
50 void AuraLayoutManagerAdapter::OnWillRemoveWindowFromLayout( 50 void AuraLayoutManagerAdapter::OnWillRemoveWindowFromLayout(
51 aura::Window* child) { 51 aura::Window* child) {
52 wm_layout_manager_->OnWillRemoveWindowFromLayout(WmWindowAura::Get(child)); 52 wm_layout_manager_->OnWillRemoveWindowFromLayout(WmWindow::Get(child));
53 } 53 }
54 54
55 void AuraLayoutManagerAdapter::OnWindowRemovedFromLayout(aura::Window* child) { 55 void AuraLayoutManagerAdapter::OnWindowRemovedFromLayout(aura::Window* child) {
56 wm_layout_manager_->OnWindowRemovedFromLayout(WmWindowAura::Get(child)); 56 wm_layout_manager_->OnWindowRemovedFromLayout(WmWindow::Get(child));
57 } 57 }
58 58
59 void AuraLayoutManagerAdapter::OnChildWindowVisibilityChanged( 59 void AuraLayoutManagerAdapter::OnChildWindowVisibilityChanged(
60 aura::Window* child, 60 aura::Window* child,
61 bool visible) { 61 bool visible) {
62 wm_layout_manager_->OnChildWindowVisibilityChanged(WmWindowAura::Get(child), 62 wm_layout_manager_->OnChildWindowVisibilityChanged(WmWindow::Get(child),
63 visible); 63 visible);
64 } 64 }
65 65
66 void AuraLayoutManagerAdapter::SetChildBounds( 66 void AuraLayoutManagerAdapter::SetChildBounds(
67 aura::Window* child, 67 aura::Window* child,
68 const gfx::Rect& requested_bounds) { 68 const gfx::Rect& requested_bounds) {
69 wm_layout_manager_->SetChildBounds(WmWindowAura::Get(child), 69 wm_layout_manager_->SetChildBounds(WmWindow::Get(child), requested_bounds);
70 requested_bounds);
71 } 70 }
72 71
73 } // namespace ash 72 } // namespace ash
OLDNEW
« no previous file with comments | « ash/app_list/app_list_presenter_delegate.cc ('k') | ash/aura/wm_lookup_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698