Revert 259580 "Move wm/public into wm target"

trunk/src/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/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 469 matching lines @@
     content_size_ = gfx::Size(width, height);
     if (!platform_)
       platform_ = new ShellPlatformDataAura(content_size_);
     else
       platform_->ResizeWindow(content_size_);
     return;
   }
 #if defined(OS_CHROMEOS)
   window_widget_ = views::Widget::CreateWindowWithContextAndBounds(
       new ShellWindowDelegateView(this),
-      wm_test_helper_->root_window(),
+      wm_test_helper_->GetDefaultParent(NULL, NULL, gfx::Rect()),
       gfx::Rect(0, 0, width, height));
 #else
   window_widget_ = new views::Widget;
   views::Widget::InitParams params;
   params.bounds = gfx::Rect(0, 0, width, height);
   params.delegate = new ShellWindowDelegateView(this);
   params.top_level = true;
   params.remove_standard_frame = true;
   window_widget_->Init(params);
 #endif
@@ skipping 59 matching lines @@
 
 void Shell::PlatformWebContentsFocused(WebContents* contents) {
   if (headless_)
     return;
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->OnWebContentsFocused(contents);
 }
 
 }  // namespace content