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

Unified Diff: ash/wm/root_window_layout_manager.cc

Issue 2871813002: Converts remaining usage of WmLayoutManager to aura::LayoutManager (Closed)
Patch Set: cleanup 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/root_window_layout_manager.h ('k') | ash/wm/system_modal_container_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/root_window_layout_manager.cc
diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc
index 40b4df66b004c665e64f86603a9b06b1de9dfae5..58359b0ed20d1841e05788f2b291d7ad76c9ef22 100644
--- a/ash/wm/root_window_layout_manager.cc
+++ b/ash/wm/root_window_layout_manager.cc
@@ -4,7 +4,6 @@
#include "ash/wm/root_window_layout_manager.h"
-#include "ash/wm_window.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tracker.h"
@@ -42,7 +41,7 @@ namespace wm {
////////////////////////////////////////////////////////////////////////////////
// RootWindowLayoutManager, public:
-RootWindowLayoutManager::RootWindowLayoutManager(WmWindow* owner)
+RootWindowLayoutManager::RootWindowLayoutManager(aura::Window* owner)
: owner_(owner) {}
RootWindowLayoutManager::~RootWindowLayoutManager() {}
@@ -51,23 +50,24 @@ RootWindowLayoutManager::~RootWindowLayoutManager() {}
// RootWindowLayoutManager, aura::LayoutManager implementation:
void RootWindowLayoutManager::OnWindowResized() {
- ResizeWindow(owner_->aura_window()->children(),
- gfx::Rect(owner_->GetBounds().size()), 0);
+ ResizeWindow(owner_->children(), gfx::Rect(owner_->bounds().size()), 0);
}
-void RootWindowLayoutManager::OnWindowAddedToLayout(WmWindow* child) {}
+void RootWindowLayoutManager::OnWindowAddedToLayout(aura::Window* child) {}
-void RootWindowLayoutManager::OnWillRemoveWindowFromLayout(WmWindow* child) {}
+void RootWindowLayoutManager::OnWillRemoveWindowFromLayout(
+ aura::Window* child) {}
-void RootWindowLayoutManager::OnWindowRemovedFromLayout(WmWindow* child) {}
+void RootWindowLayoutManager::OnWindowRemovedFromLayout(aura::Window* child) {}
-void RootWindowLayoutManager::OnChildWindowVisibilityChanged(WmWindow* child,
- bool visible) {}
+void RootWindowLayoutManager::OnChildWindowVisibilityChanged(
+ aura::Window* child,
+ bool visible) {}
void RootWindowLayoutManager::SetChildBounds(
- WmWindow* child,
+ aura::Window* child,
const gfx::Rect& requested_bounds) {
- child->SetBoundsDirect(requested_bounds);
+ SetChildBoundsDirect(child, requested_bounds);
}
} // namespace wm
« no previous file with comments | « ash/wm/root_window_layout_manager.h ('k') | ash/wm/system_modal_container_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698