Routes WindowManager functionality through the view manager

services/window_manager/window_manager_app.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 "services/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
@@ skipping 69 matching lines @@
   connections_.insert(connection);
 }
 
 void WindowManagerApp::RemoveConnection(WindowManagerImpl* connection) {
   DCHECK(connections_.find(connection) != connections_.end());
   connections_.erase(connection);
 }
 
 bool WindowManagerApp::SetCapture(Id view_id) {
   View* view = view_manager()->GetViewById(view_id);
-  if (!view)
-    return false;
-  capture_controller_->SetCapture(view);
-  return capture_controller_->GetCapture() == view;
+  return view && SetCapture(view);
 }
 
 bool WindowManagerApp::FocusWindow(Id view_id) {
   View* view = view_manager()->GetViewById(view_id);
-  if (!view)
-    return false;
-  focus_controller_->FocusView(view);
-  return focus_controller_->GetFocusedView() == view;
+  return view && FocusWindow(view);
 }
 
 bool WindowManagerApp::ActivateWindow(Id view_id) {
   View* view = view_manager()->GetViewById(view_id);
-  if (!view)
-    return false;
-  focus_controller_->ActivateView(view);
-  return focus_controller_->GetActiveView() == view;
+  return view && ActivateWindow(view);
 }
 
 bool WindowManagerApp::IsReady() const {
   return root_;
 }
 
 void WindowManagerApp::InitFocus(scoped_ptr<FocusRules> rules) {
   DCHECK(root_);
 
   focus_controller_.reset(new FocusController(rules.Pass()));
@@ skipping 64 matching lines @@
 void WindowManagerApp::OnViewManagerDisconnected(
     mojo::ViewManager* view_manager) {
   if (wrapped_view_manager_delegate_)
     wrapped_view_manager_delegate_->OnViewManagerDisconnected(view_manager);
 
   base::MessageLoop* message_loop = base::MessageLoop::current();
   if (message_loop && message_loop->is_running())
     message_loop->Quit();
 }
 
+void WindowManagerApp::OnPerformAction(mojo::View* view,

[msw, 2015/02/25 22:29:30]

nit: match the function definition order of this "ViewManagerDelegate
implementation" section with the declarations in the header.

[sky, 2015/02/25 23:20:27]

The order here and in the header is consistent, but overall .cc is out of order
with the .h. I'll fix that separately.

+                                       const std::string& action) {
+  if (!view)
+    return;
+  if (action == "capture")
+    SetCapture(view);
+  else if (action == "focus")
+    FocusWindow(view);
+  else if (action == "activate")
+    ActivateWindow(view);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, ViewObserver implementation:
 
 void WindowManagerApp::OnTreeChanged(
     const ViewObserver::TreeChangeParams& params) {
   if (params.receiver != root_)
     return;
   DCHECK(params.old_parent || params.new_parent);
   if (!params.target)
     return;
@@ skipping 67 matching lines @@
        it != connections_.end(); ++it) {
     (*it)->NotifyCaptureChanged(GetIdForView(gained_capture));
   }
   if (gained_capture)
     gained_capture->MoveToFront();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, private:
 
+bool WindowManagerApp::SetCapture(View* view) {
+  CHECK(view);
+  capture_controller_->SetCapture(view);
+  return capture_controller_->GetCapture() == view;
+}
+
+bool WindowManagerApp::FocusWindow(View* view) {
+  CHECK(view);
+  focus_controller_->FocusView(view);
+  return focus_controller_->GetFocusedView() == view;
+}
+
+bool WindowManagerApp::ActivateWindow(View* view) {
+  CHECK(view);
+  focus_controller_->ActivateView(view);
+  return focus_controller_->GetActiveView() == view;
+}
+
 void WindowManagerApp::RegisterSubtree(View* view) {
   view->AddObserver(this);
   DCHECK(registered_view_id_set_.find(view->id()) ==
          registered_view_id_set_.end());
   // All events pass through the root during dispatch, so we only need a handler
   // installed there.
   if (view == root_) {
     ViewTarget* target = ViewTarget::TargetFromView(view);
     target->SetEventTargeter(scoped_ptr<ViewTargeter>(new ViewTargeter()));
     target->AddPreTargetHandler(this);
@@ skipping 86 matching lines @@
 void WindowManagerApp::SetViewManagerClient(
     mojo::ScopedMessagePipeHandle view_manager_client_request) {
   view_manager_client_.reset(
       mojo::ViewManagerClientFactory::WeakBindViewManagerToPipe(
           mojo::MakeRequest<mojo::ViewManagerClient>(
               view_manager_client_request.Pass()),
           view_manager_service_.Pass(), shell_, this));
 }
 
 }  // namespace window_manager