ash: don't override GetInitiallyFocusedView in WindowCycleList

Bug: 1075649
Change-Id: I340b9a7c0b1dc00122c4cf893b64ac83b425e358
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2459050Reviewed-by: Robert Flack <flackr@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815196}

ash/wm/window_cycle_list.cc

@@ -357,8 +357,12 @@ class WindowCycleView : public views::WidgetDelegateView,
     if (target_it != window_view_map_.end())
       target_it->second->UpdateBorderState(/*show=*/true);
 
-    if (GetWidget() && target_window_)
-      window_view_map_[target_window_]->RequestFocus();
+    if (target_window_) {
+      if (GetWidget())
+        window_view_map_[target_window_]->RequestFocus();
+      else
+        SetInitiallyFocusedView(window_view_map_[target_window_]);
+    }
   }
 
   void HandleWindowDestruction(aura::Window* destroying_window,
@@ -470,10 +474,6 @@ class WindowCycleView : public views::WidgetDelegateView,
 
   aura::Window* GetTargetWindow() { return target_window_; }
 
-  View* GetInitiallyFocusedView() override {
-    return window_view_map_[target_window_];
-  }
-
   const views::View::Views& GetPreviewViewsForTesting() const {
     return mirror_container_->children();
   }