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

Unified Diff: ui/aura/window.cc

Issue 7903018: More shell content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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
Index: ui/aura/window.cc
===================================================================
--- ui/aura/window.cc (revision 101372)
+++ ui/aura/window.cc (working copy)
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "ui/aura/desktop.h"
#include "ui/aura/event.h"
+#include "ui/aura/layout_manager.h"
#include "ui/aura/window_delegate.h"
#include "ui/aura/window_manager.h"
#include "ui/gfx/canvas_skia.h"
@@ -59,12 +60,21 @@
SchedulePaint();
}
+void Window::SetLayoutManager(LayoutManager* layout_manager) {
+ layout_manager_.reset(layout_manager);
+}
+
void Window::SetBounds(const gfx::Rect& bounds, int anim_ms) {
// TODO: support anim_ms
// TODO: funnel this through the Desktop.
bool was_move = bounds_.size() == bounds.size();
+ gfx::Rect old_bounds = bounds_;
bounds_ = bounds;
layer_->SetBounds(bounds);
+ if (layout_manager_.get())
+ layout_manager_->OnWindowResized();
+ if (delegate_)
+ delegate_->OnBoundsChanged(old_bounds, bounds_);
if (was_move)
SchedulePaintInRect(gfx::Rect());
else

Powered by Google App Engine
This is Rietveld 408576698