Adding application lifetime tests to athena, allowing to override focus request for applciations

athena/extensions/athena_app_window_client_base.cc

Index: athena/extensions/athena_app_window_client_base.cc
diff --git a/athena/extensions/athena_app_window_client_base.cc b/athena/extensions/athena_app_window_client_base.cc
index a37d1b2a632c1fa8e5f16531a8321cf97f57716e..e9793fa37e23bcd33d4cd1e56cde164b4c44d102 100644
--- a/athena/extensions/athena_app_window_client_base.cc
+++ b/athena/extensions/athena_app_window_client_base.cc
@@ -7,6 +7,8 @@
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/extensions/athena_native_app_window_views.h"
+#include "athena/wm/public/window_list_provider.h"
+#include "athena/wm/public/window_manager.h"
 #include "extensions/common/extension.h"
 
 namespace athena {
@@ -19,11 +21,30 @@ AthenaAppWindowClientBase::~AthenaAppWindowClientBase() {
 
 extensions::NativeAppWindow* AthenaAppWindowClientBase::CreateNativeAppWindow(
     extensions::AppWindow* app_window,
-    const extensions::AppWindow::CreateParams& params) {
+    extensions::AppWindow::CreateParams* params) {
   AthenaNativeAppWindowViews* native_window = new AthenaNativeAppWindowViews;
-  native_window->Init(app_window, params);
+  native_window->Init(app_window, *params);
   ActivityFactory::Get()->CreateAppActivity(app_window->extension_id(),
                                             native_window->GetWebView());
+  if (params->focused) {
+    // This creation will have created the window at the top. If it has been
+    // placed somewhere else it must have been done intentionally and we should
+    // not set the focus since it will change the window order again.
+    const aura::Window::Windows& window_list =
+        WindowManager::Get()->GetWindowListProvider()->GetWindowList();
+    aura::Window* native_app_window =
+        native_window->widget()->GetNativeWindow();
+    std::vector<aura::Window*>::const_iterator iter =
+        std::find(window_list.begin(), window_list.end(), native_app_window);
+    // TODO(skuhne): With issue 421680 this might get better identifiable.
+    // The application window might have been created as a panel - if it was, it
+    // will not be in our WindowListProvider list. However - if it was not at
+    // the end of the list (top of the stack), the window was intentionally
+    // moved after creation to a different location and we have to respect this
+    // location and suppress focusing - which would bring it back to the front.
+    if (iter != window_list.end() && ++iter != window_list.end())
+      params->focused = false;
+  }
   return native_window;
 }