Routes WindowManager functionality through the view manager

mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.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 "view_manager/public/cpp/lib/view_manager_client_impl.h"
 
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
@@ skipping 154 matching lines @@
   DCHECK(service_);
   if (surface_id.is_null())
     return;
   service_->SetViewSurfaceId(
       view_id, surface_id.Pass(), ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::SetFocus(Id view_id) {
   // In order for us to get here we had to have exposed a view, which implies we
   // got a connection.
-  DCHECK(window_manager_.get());
-  window_manager_->FocusWindow(view_id, ActionCompletedCallback());
+  DCHECK(service_);
+  service_->PerformAction(view_id, "focus", ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::SetVisible(Id view_id, bool visible) {
   DCHECK(service_);
   service_->SetViewVisibility(view_id, visible, ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::SetProperty(
     Id view_id,
     const std::string& name,
@@ skipping 224 matching lines @@
     const Callback<void()>& ack_callback) {
   View* view = GetViewById(view_id);
   if (view) {
     FOR_EACH_OBSERVER(ViewObserver,
                       *ViewPrivate(view).observers(),
                       OnViewInputEvent(view, event));
   }
   ack_callback.Run();
 }
 
+void ViewManagerClientImpl::OnPerformAction(Id view_id, const String& name) {
+  View* view = GetViewById(view_id);
+  delegate_->OnPerformAction(view, name);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ViewManagerClientImpl, WindowManagerObserver implementation:
 
 void ViewManagerClientImpl::OnCaptureChanged(Id capture_view_id) {
   View* gained_capture = GetViewById(capture_view_id);
   View* lost_capture = capture_view_;
   if (lost_capture) {
     FOR_EACH_OBSERVER(ViewObserver,
                       *ViewPrivate(lost_capture).observers(),
                       OnViewFocusChanged(gained_capture, lost_capture));
@@ skipping 56 matching lines @@
 void ViewManagerClientImpl::OnActionCompleted(bool success) {
   if (!change_acked_callback_.is_null())
     change_acked_callback_.Run();
 }
 
 Callback<void(bool)> ViewManagerClientImpl::ActionCompletedCallback() {
   return [this](bool success) { OnActionCompleted(success); };
 }
 
 }  // namespace mojo