chromeos: changes DisconnectedAppHandler to be associated with a single window

ash/mus/root_window_controller.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/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
+#include "ash/mus/disconnected_app_handler.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/screen_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_settings.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
@@ skipping 41 matching lines @@
       window_tree_host_(window_tree_host.get()),
       window_count_(0),
       display_(display) {
   ash::InitRootWindowSettings(window_tree_host->window());
   window_tree_host->window()->SetProperty(kRootWindowControllerKey, this);
   WmShellMus::Get()->AddRootWindowController(this);
   ash_root_window_controller_ = base::WrapUnique(
       new ash::RootWindowController(nullptr, window_tree_host.release()));
   ash_root_window_controller_->Init(root_window_type);
 
-  disconnected_app_handler_.reset(new DisconnectedAppHandler(root()));
-
   for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) {
     window_manager_->window_manager_client()->AddActivationParent(
         GetWindowByShellWindowId(kActivatableShellWindowIds[i])->aura_window());
   }
 }
 
 RootWindowController::~RootWindowController() {
   Shutdown();
   ash_root_window_controller_.reset();
   WmShellMus::Get()->RemoveRootWindowController(this);
@@ skipping 38 matching lines @@
   window_count_++;
 
   const bool provide_non_client_frame =
       window_type == ui::mojom::WindowType::WINDOW ||
       window_type == ui::mojom::WindowType::PANEL;
   if (provide_non_client_frame) {
     // See NonClientFrameController for details on lifetime.
     NonClientFrameController* non_client_frame_controller =
         new NonClientFrameController(container_window, context, bounds,
                                      window_type, properties, window_manager_);
+    DisconnectedAppHandler::Create(non_client_frame_controller->window());
     return non_client_frame_controller->window();
   }
 
   aura::Window* window = new aura::Window(nullptr);
   aura::SetWindowType(window, window_type);
   // Apply properties before Init(), that way they are sent to the server at
   // the time the window is created.
   aura::PropertyConverter* property_converter =
       window_manager_->property_converter();
   for (auto& property_pair : *properties) {
     property_converter->SetPropertyFromTransportValue(
         window, property_pair.first, &property_pair.second);
   }
   window->Init(ui::LAYER_TEXTURED);
   window->SetBounds(bounds);
+  DisconnectedAppHandler::Create(window);
 
   if (container_window) {
     container_window->AddChild(window);
   } else {
     WmWindowAura* root = WmWindowAura::Get(this->root());
     gfx::Point origin =
         root->ConvertPointToTarget(root->GetRootWindow(), gfx::Point());
     origin += display_.bounds().OffsetFromOrigin();
     gfx::Rect bounds_in_screen(origin, bounds.size());
     static_cast<WmWindowAura*>(
@@ skipping 65 matching lines @@
   } else {
     width = root()->bounds().width() - 240;
     height = root()->bounds().height() - 240;
   }
   return gfx::Rect(40 + (window_count_ % 4) * 40, 40 + (window_count_ % 4) * 40,
                    width, height);
 }
 
 }  // namespace mus
 }  // namespace ash