Removes a couple more functions from WmWindow

ash/wm/focus_rules.cc

Index: ash/wm/focus_rules.cc
diff --git a/ash/wm/focus_rules.cc b/ash/wm/focus_rules.cc
index 4477e9d485c56a1f82fe68b7da04f7dfaf9e8cde..6bb9484d256d2011963d7e3730700dee325c83c1 100644
--- a/ash/wm/focus_rules.cc
+++ b/ash/wm/focus_rules.cc
@@ -20,7 +20,7 @@ bool IsToplevelWindow(WmWindow* window) {
 
   // 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) {
@@ -51,7 +51,7 @@ bool IsWindowConsideredVisibleForActivation(WmWindow* window) {
   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;
 }