Converts WmActivationObserver to aura::client::ActivationChangeObserver

ash/shell.cc

 // Copyright (c) 2012 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/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 662 matching lines @@
 
   env_filter_.reset(new ::wm::CompoundEventFilter);
   AddPreTargetHandler(env_filter_.get());
 
   wm::AshFocusRules* focus_rules = new wm::AshFocusRules();
 
   ::wm::FocusController* focus_controller =
       new ::wm::FocusController(focus_rules);
   focus_client_.reset(focus_controller);
   activation_client_ = focus_controller;
+  // TODO(sky): Shell should implement ActivationChangeObserver, not WmShell.
+  activation_client_->AddObserver(wm_shell_.get());

[James Cook, 2017/03/08 02:54:12]

nit: I would also add a note that this is cleaned up in WmShell (since it's odd
that the cleanup isn't in this file).

[sky, 2017/03/08 05:04:06]

I'm going to leave this as the next patch nukes it.

 
   screen_position_controller_.reset(new ScreenPositionController);
 
   wm_shell_->CreatePrimaryHost();
   wm_shell_->set_root_window_for_new_windows(
       WmWindow::Get(GetPrimaryRootWindow()));
 
   if (!is_mash) {
     resolution_notification_controller_.reset(
         new ResolutionNotificationController);
@@ skipping 258 matching lines @@
 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
   return std::unique_ptr<ui::EventTargetIterator>();
 }
 
 ui::EventTargeter* Shell::GetEventTargeter() {
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace ash