Make GetRootWindow() return a Window instead of a RootWindow.

content/shell/browser/shell_views.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/browser/shell.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
@@ skipping 343 matching lines @@
           gfx::Rect(0, 0, width, height));
 #else
   window_widget_ =
       views::Widget::CreateWindowWithBounds(new ShellWindowDelegateView(this),
                gfx::Rect(0, 0, width, height));
 #endif
 
   window_ = window_widget_->GetNativeWindow();
   // Call ShowRootWindow on RootWindow created by MinimalShell without
   // which XWindow owned by RootWindow doesn't get mapped.
-  window_->GetRootWindow()->ShowRootWindow();
+  window_->GetDispatcher()->ShowRootWindow();
   window_widget_->Show();
 }
 
 void Shell::PlatformSetContents() {
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetWebContents(web_contents_.get());
 }
 
 void Shell::PlatformResizeSubViews() {
 }
 
 void Shell::Close() {
   window_widget_->CloseNow();
 }
 
 void Shell::PlatformSetTitle(const string16& title) {
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetWindowTitle(title);
   window_widget_->UpdateWindowTitle();
 }
 
 }  // namespace content