Revert "Remove aura and make a pure mojo::View version of the aura::Window FocusController."

examples/wm_flow/wm/frame_controller.cc

 // Copyright 2014 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 "examples/wm_flow/wm/frame_controller.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
@@ skipping 81 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(FrameEventHandler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // FrameController, public:
 
 FrameController::FrameController(
     mojo::Shell* shell,
     mojo::View* view,
     mojo::View** app_view,
+    aura::client::ActivationClient* activation_client,
     mojo::WindowManagerApp* window_manager_app)
     : view_(view),
       app_view_(mojo::View::Create(view->view_manager())),
       frame_view_(new views::View),
       frame_view_layout_manager_(new LayoutManager(this)),
       widget_(new views::Widget),
       maximized_(false),
+      activation_client_(activation_client),
       window_manager_app_(window_manager_app) {
   view_->AddChild(app_view_);
   view_->AddObserver(this);
   *app_view = app_view_;
   frame_view_->set_background(
       views::Background::CreateSolidBackground(SK_ColorBLUE));
   frame_view_->SetLayoutManager(frame_view_layout_manager_);
   frame_event_handler_.reset(new FrameEventHandler(this));
   frame_view_->AddPreTargetHandler(frame_event_handler_.get());
   views::Widget::InitParams params(
@@ skipping 18 matching lines @@
   if (!maximized_)
     restored_bounds_ = view_->bounds().To<gfx::Rect>();
   maximized_ = !maximized_;
   if (maximized_)
     view_->SetBounds(view_->parent()->bounds());
   else
     view_->SetBounds(*mojo::Rect::From(restored_bounds_));
 }
 
 void FrameController::ActivateWindow() {
-  window_manager_app_->focus_controller()->ActivateView(view_);
+  aura::Window* window = window_manager_app_->GetWindowForViewId(view_->id());
+  activation_client_->ActivateWindow(window);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FrameController, mojo::ViewObserver implementation:
 
 void FrameController::OnViewDestroyed(mojo::View* view) {
   view_->RemoveObserver(this);
   delete this;
 }