Removes a couple more functions from WmWindow

ash/wm/focus_rules.cc

 // Copyright 2016 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/focus_rules.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm_window.h"
 
 namespace ash {
 
 bool IsToplevelWindow(WmWindow* window) {
   DCHECK(window);
   // The window must in a valid hierarchy.
   if (!window->GetRootWindow())
     return false;
 
   // The window must exist within a container that supports activation.
   // The window cannot be blocked by a modal transient.
-  return IsActivatableShellWindowId(window->GetParent()->GetShellWindowId());
+  return IsActivatableShellWindowId(window->GetParent()->aura_window()->id());
 }
 
 bool IsWindowConsideredActivatable(WmWindow* window) {
   DCHECK(window);
   // Only toplevel windows can be activated.
   if (!IsToplevelWindow(window))
     return false;
 
   // The window must be visible.
   return IsWindowConsideredVisibleForActivation(window);
@@ skipping 10 matching lines @@
     return true;
 
   // Minimized windows are hidden in their minimized state, but they can always
   // be activated.
   if (window->GetWindowState()->IsMinimized())
     return true;
 
   if (!window->GetTargetVisibility())
     return false;
 
-  const int parent_shell_window_id = window->GetParent()->GetShellWindowId();
+  const int parent_shell_window_id = window->GetParent()->aura_window()->id();
   return parent_shell_window_id == kShellWindowId_DefaultContainer ||
          parent_shell_window_id == kShellWindowId_LockScreenContainer;
 }
 
 }  // namespace ash