Move wm_flow off of views and onto Sky

examples/wm_flow/wm/wm.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 <vector>
-
 #include "examples/wm_flow/wm/frame_controller.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
-#include "mojo/views/views_init.h"
 #include "services/window_manager/basic_focus_rules.h"
 #include "services/window_manager/window_manager_app.h"
 #include "services/window_manager/window_manager_delegate.h"
+#include "url/gurl.h"
 
 namespace examples {
 
 class SimpleWM : public mojo::ApplicationDelegate,
                  public mojo::ViewManagerDelegate,
                  public window_manager::WindowManagerDelegate,
                  public mojo::ViewObserver {
  public:
   SimpleWM()
-      : shell_(nullptr),
-        window_manager_app_(new window_manager::WindowManagerApp(this, this)),
+      : window_manager_app_(new window_manager::WindowManagerApp(this, this)),
         root_(NULL),
         window_container_(NULL),
         next_window_origin_(10, 10) {}
   virtual ~SimpleWM() {}
 
  private:
   // Overridden from mojo::ApplicationDelegate:
   virtual void Initialize(mojo::ApplicationImpl* impl) override {
-    // Create views_init here as we need ApplicationRunnerChromium to install
-    // an AtExitManager and CommandLine.
-    if (!views_init_.get())
-      views_init_.reset(new mojo::ViewsInit);
-    shell_ = impl->shell();
+    // FIXME: Mojo applications don't know their URLs yet:
+    // https://docs.google.com/a/chromium.org/document/d/1AQ2y6ekzvbdaMF5WrUQmneyXJnke-MnYYL4Gz1AKDos
+    url_ = GURL(impl->args()[1]);
     window_manager_app_->Initialize(impl);
   }
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     window_manager_app_->ConfigureIncomingConnection(connection);
     return true;
   }
 
   // Overridden from mojo::ViewManagerDelegate:
   virtual void OnEmbed(
@@ skipping 55 matching lines @@
     mojo::View* frame_view = root_->view_manager()->CreateView();
     // Add the View to it's parent before showing so that animations can happen.
     window_container_->AddChild(frame_view);
     mojo::Rect rect;
     rect.x = next_window_origin_.x();
     rect.y = next_window_origin_.y();
     rect.width = rect.height = 400;
     frame_view->SetBounds(rect);
     next_window_origin_.Offset(50, 50);
 
-    new FrameController(
-        shell_, frame_view, app_view, window_manager_app_.get());
+    GURL frame_url = url_.Resolve("/examples/wm_flow/wm/window_frame.sky");
+    new FrameController(frame_url, frame_view, app_view,
+                        window_manager_app_.get());
     return frame_view;
   }
 
-  mojo::Shell* shell_;
-
-  scoped_ptr<mojo::ViewsInit> views_init_;
-
   scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
 
+  GURL url_;
   mojo::View* root_;
   mojo::View* window_container_;
 
   gfx::Point next_window_origin_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleWM);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new examples::SimpleWM);
   return runner.Run(shell_handle);
 }