Revert 270867 "Mojo: Internalize ServiceConnector<>"

trunk/src/mojo/examples/launcher/launcher.cc

 // Copyright 2013 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 <stdio.h>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 170 matching lines @@
       url_receiver_->OnURLEntered(url.spec());
     }
     return false;
   }
 
   URLReceiver* url_receiver_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherController);
 };
 
-class LauncherImpl : public InterfaceImpl<Launcher>,
+class LauncherImpl : public ServiceConnection<Launcher, LauncherImpl>,
                      public URLReceiver {
  public:
-  explicit LauncherImpl(Application* app)
-      : app_(app),
-        launcher_controller_(this),
+  LauncherImpl()
+      : launcher_controller_(this),
         pending_show_(false) {
+  }
+
+  void Initialize() {
     screen_.reset(ScreenMojo::Create());
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
 
     NativeViewportPtr viewport;
-    app_->ConnectTo("mojo:mojo_native_viewport_service", &viewport);
+    ConnectTo(shell(), "mojo:mojo_native_viewport_service", &viewport);
 
     window_tree_host_.reset(new WindowTreeHostMojo(
         viewport.Pass(), gfx::Rect(50, 50, 450, 60),
         base::Bind(&LauncherImpl::HostContextCreated, base::Unretained(this))));
   }
 
  private:
   // Overridden from Launcher:
   virtual void Show() OVERRIDE {
     if (!window_tree_host_.get()) {
@@ skipping 28 matching lines @@
         new LauncherWindowTreeClient(window_tree_host_->window()));
 
     launcher_controller_.InitInWindow(window_tree_host_->window());
 
     if (pending_show_) {
       pending_show_ = false;
       Show();
     }
   }
 
-  Application* app_;
   scoped_ptr<ScreenMojo> screen_;
   scoped_ptr<LauncherWindowTreeClient> window_tree_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<ui::EventHandler> ime_filter_;
 
   LauncherController launcher_controller_;
 
   scoped_ptr<aura::WindowTreeHost> window_tree_host_;
 
@@ skipping 17 matching lines @@
 
   base::MessageLoop loop;
   mojo::GLES2Initializer gles2;
 
   // TODO(beng): This crashes in a DCHECK on X11 because this thread's
   //             MessageLoop is not of TYPE_UI. I think we need a way to build
   //             Aura that doesn't define platform-specific stuff.
   aura::Env::CreateInstance(true);
 
   mojo::Application app(shell_handle);
-  app.AddService<mojo::examples::LauncherImpl>(&app);
+  app.AddServiceConnector(
+      new mojo::ServiceConnector<mojo::examples::LauncherImpl>());
 
   loop.Run();
   return MOJO_RESULT_OK;
 }