Removes a couple more functions from WmWindow

ash/wm/panels/panel_layout_manager.cc

 // Copyright (c) 2012 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 "ash/wm/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
@@ skipping 204 matching lines @@
     views::Widget::InitParams params;
     params.type = views::Widget::InitParams::TYPE_POPUP;
     params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
     params.keep_on_top = true;
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.bounds = parent->ConvertRectToScreen(gfx::Rect());
     params.bounds.set_width(kArrowWidth);
     params.bounds.set_height(kArrowHeight);
     params.accept_events = false;
     parent->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
-        this, parent->GetShellWindowId(), &params);
+        this, parent->aura_window()->id(), &params);
     set_focus_on_creation(false);
     Init(params);
     WmWindow* widget_window = WmWindow::Get(this->GetNativeWindow());
     DCHECK_EQ(widget_window->GetRootWindow(), parent->GetRootWindow());
     views::View* content_view = new views::View;
     background_ = new CalloutWidgetBackground;
     content_view->set_background(background_);
     SetContentsView(content_view);
     widget_window->GetLayer()->SetOpacity(0);
   }
@@ skipping 31 matching lines @@
   Shutdown();
 }
 
 // static
 PanelLayoutManager* PanelLayoutManager::Get(WmWindow* window) {
   if (!window)
     return nullptr;
 
   return static_cast<PanelLayoutManager*>(
       window->GetRootWindow()
-          ->GetChildByShellWindowId(kShellWindowId_PanelContainer)
           ->aura_window()
+          ->GetChildById(kShellWindowId_PanelContainer)
           ->layout_manager());
 }
 
 void PanelLayoutManager::Shutdown() {
   if (shelf_) {
     shelf_->RemoveObserver(this);
     shelf_ = nullptr;
   }
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
@@ skipping 652 matching lines @@
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 void PanelLayoutManager::OnKeyboardClosed() {
   keyboard_observer_.RemoveAll();
 }
 
 }  // namespace ash