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

Unified Diff: content/shell/browser/shell_aura.cc

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month 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 | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/shell/browser/shell_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_aura.cc
diff --git a/content/shell/browser/shell_aura.cc b/content/shell/browser/shell_aura.cc
index c14b9f314c0a7169a532d49e29c98bca2011fefa..6d669639c0fbbacc896fbaefe9d7c3668824749a 100644
--- a/content/shell/browser/shell_aura.cc
+++ b/content/shell/browser/shell_aura.cc
@@ -40,7 +40,7 @@ class FillLayout : public aura::LayoutManager {
}
virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
- child->SetBounds(gfx::Rect(root_->GetHostSize()));
+ child->SetBounds(gfx::Rect(root_->host()->GetBounds().size()));
}
virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {
@@ -128,7 +128,7 @@ ShellAuraPlatformData::ShellAuraPlatformData() {
aura::TestScreen* screen = aura::TestScreen::Create();
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen);
root_window_.reset(screen->CreateRootWindowForPrimaryDisplay());
- root_window_->ShowRootWindow();
+ root_window_->host()->Show();
root_window_->window()->SetLayoutManager(new FillLayout(root_window_.get()));
focus_client_.reset(new aura::test::TestFocusClient());
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/shell/browser/shell_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698