Splitting the Mus demo code out of a service.

services/ui/demo/mus_demo.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_UI_DEMO_MUS_DEMO_H_
 #define SERVICES_UI_DEMO_MUS_DEMO_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace ui {
 class BitmapUploader;
 class GpuService;
 
 namespace demo {
 
-// A simple MUS Demo service. This service connects to the mojo:ui, creates a
-// new window and draws a spinning square in the center of the window. Provides
-// a simple way to demonstrate that the graphic stack works as intended.
-class MusDemo : public service_manager::Service,
-                public WindowTreeClientDelegate,
+// A simple MUS Demo. It connects to the service:ui, creates a new window and
+// draws a spinning square in the center of the window. Provides a simple way
+// to demonstrate that the graphic stack works as intended.
+class MusDemo : public WindowTreeClientDelegate,
                 public WindowManagerDelegate {
  public:
   MusDemo();
   ~MusDemo() override;
 
+  void Start(service_manager::Connector* connector);

[sky, 2016/10/21 23:18:23]

Start->Init

[Jay Civelli, 2016/10/22 00:00:16]

Start seems more appropriate since it is really starting the demo.
Let me know if you disagree.

+
  private:
-  // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override;
-  bool OnConnect(const service_manager::Identity& remote_identity,
-                 service_manager::InterfaceRegistry* registry) override;
-
   // WindowTreeClientDelegate:
   void OnEmbed(Window* root) override;
   void OnEmbedRootDestroyed(Window* root) override;
   void OnLostConnection(WindowTreeClient* client) override;
   void OnPointerEventObserved(const PointerEvent& event,
                               Window* target) override;
 
   // WindowManagerDelegate:
   void SetWindowManagerClient(WindowManagerClient* client) override;
   bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override;
@@ skipping 28 matching lines @@
 
   // Bitmap that is the same size as our client window area.
   SkBitmap bitmap_;
 
   // Timer for calling DrawFrame().
   base::RepeatingTimer timer_;
 
   // Current rotation angle for drawing.
   double angle_ = 0.0;
 
+  // Last time a frame was drawn.
+  base::TimeTicks last_draw_frame_time_;
+
   DISALLOW_COPY_AND_ASSIGN(MusDemo);
 };
 
 }  // namespace demo
 }  // namespace ui
 
 #endif  // SERVICES_UI_DEMO_MUS_DEMO_H_