Removes a couple more functions from WmWindow

ash/wm/always_on_top_controller.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/always_on_top_controller.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 
 AlwaysOnTopController::AlwaysOnTopController(WmWindow* viewport)
     : always_on_top_container_(viewport) {
-  DCHECK_NE(kShellWindowId_DefaultContainer, viewport->GetShellWindowId());
+  DCHECK_NE(kShellWindowId_DefaultContainer, viewport->aura_window()->id());
   always_on_top_container_->SetLayoutManager(
       base::MakeUnique<WorkspaceLayoutManager>(viewport));
   // Container should be empty.
   DCHECK(always_on_top_container_->GetChildren().empty());
   always_on_top_container_->aura_window()->AddObserver(this);
 }
 
 AlwaysOnTopController::~AlwaysOnTopController() {
   if (always_on_top_container_)
     always_on_top_container_->aura_window()->RemoveObserver(this);
@@ skipping 40 matching lines @@
 }
 
 void AlwaysOnTopController::OnWindowDestroying(aura::Window* window) {
   if (WmWindow::Get(window) == always_on_top_container_) {
     always_on_top_container_->aura_window()->RemoveObserver(this);
     always_on_top_container_ = nullptr;
   }
 }
 
 }  // namespace ash