summaryrefslogtreecommitdiffstats
path: root/aura
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 21:31:31 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-12 21:31:31 +0000
commit7a9f8918e45d73b4977984dddcefad26b6d717f0 (patch)
treeefff119ea1f3c63aa402d9cebb567fcec2a5e7c2 /aura
parent25e89676fa7fe6fea17be662d1cf52c765362288 (diff)
downloadchromium_src-7a9f8918e45d73b4977984dddcefad26b6d717f0.zip
chromium_src-7a9f8918e45d73b4977984dddcefad26b6d717f0.tar.gz
chromium_src-7a9f8918e45d73b4977984dddcefad26b6d717f0.tar.bz2
Allow Chrome-in-Aura to start.
Nothing (much) renders. WIP. http://crbug.com/93947 TEST=none Review URL: http://codereview.chromium.org/7849004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'aura')
-rw-r--r--aura/desktop.cc6
-rw-r--r--aura/desktop.h3
-rw-r--r--aura/desktop_host_win.cc9
3 files changed, 11 insertions, 7 deletions
diff --git a/aura/desktop.cc b/aura/desktop.cc
index c89e229..171da3c 100644
--- a/aura/desktop.cc
+++ b/aura/desktop.cc
@@ -60,6 +60,12 @@ bool Desktop::OnKeyEvent(const KeyEvent& event) {
return window_->HandleKeyEvent(event);
}
+void Desktop::OnHostResized(const gfx::Size& size) {
+ gfx::Rect bounds(window_->bounds().origin(), size);
+ window_->SetBounds(bounds, 0);
+ compositor_->WidgetSizeChanged(size);
+}
+
void Desktop::ScheduleCompositorPaint() {
if (schedule_paint_.empty()) {
MessageLoop::current()->PostTask(FROM_HERE,
diff --git a/aura/desktop.h b/aura/desktop.h
index e7632ad..0a2c2ae 100644
--- a/aura/desktop.h
+++ b/aura/desktop.h
@@ -47,6 +47,9 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate {
// Handles a key event. Returns true if handled.
bool OnKeyEvent(const KeyEvent& event);
+ // Called when the host changes size.
+ void OnHostResized(const gfx::Size& size);
+
// Compositor we're drawing to.
ui::Compositor* compositor() { return compositor_.get(); }
diff --git a/aura/desktop_host_win.cc b/aura/desktop_host_win.cc
index e0a3d16..f191be6 100644
--- a/aura/desktop_host_win.cc
+++ b/aura/desktop_host_win.cc
@@ -85,17 +85,12 @@ LRESULT DesktopHostWin::OnMouseRange(UINT message,
}
void DesktopHostWin::OnPaint(HDC dc) {
- if (desktop_)
- desktop_->Draw();
+ desktop_->Draw();
ValidateRect(hwnd(), NULL);
}
void DesktopHostWin::OnSize(UINT param, const CSize& size) {
- if (desktop_) {
- gfx::Rect bounds(desktop_->window()->bounds().origin(),
- gfx::Size(size.cx, size.cy));
- desktop_->window()->SetBounds(bounds, 0);
- }
+ desktop_->OnHostResized(gfx::Size(size.cx, size.cy));
}
} // namespace aura