Don't activate aura::Window on creation from DesktopNativeWidgetAura if NativeWidgetDelegate prohib…

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index 0bc292f22465cf8d6adb82e7eb21c2a4f8e2aa48..be21567ecedf691177cb9bb2adebdc640f8f06cb 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -500,8 +500,8 @@ void DesktopNativeWidgetAura::InitNativeWidget(
   if (drag_drop_client_)
     aura::client::SetDragDropClient(host_->window(), drag_drop_client_.get());
 
-  static_cast<aura::client::FocusClient*>(focus_client_.get())->
-      FocusWindow(content_window_);
+  wm::SetActivationDelegate(content_window_, this);
+  aura::client::GetFocusClient(content_window_)->FocusWindow(content_window_);
 
   OnHostResized(host());
 
@@ -537,10 +537,6 @@ void DesktopNativeWidgetAura::InitNativeWidget(
   event_client_.reset(new DesktopEventClient);
   aura::client::SetEventClient(host_->window(), event_client_.get());
 
-  aura::client::GetFocusClient(content_window_)->FocusWindow(content_window_);
-
-  wm::SetActivationDelegate(content_window_, this);
-
   shadow_controller_.reset(
       new wm::ShadowController(wm::GetActivationClient(host_->window())));