Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

mash/example/window_type_launcher/window_type_launcher.cc

 // Copyright (c) 2012 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 "mash/example/window_type_launcher/window_type_launcher.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mash/shell/public/interfaces/shell.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
@@ skipping 134 matching lines @@
   layout->AddPaddingRow(0, 5);
 }
 
 // The contents view/delegate of a window that shows some buttons that create
 // various window types.
 class WindowTypeLauncherView : public views::WidgetDelegateView,
                                public views::ButtonListener,
                                public views::MenuDelegate,
                                public views::ContextMenuController {
  public:
-  explicit WindowTypeLauncherView(mojo::ApplicationImpl* app)
-      : app_(app),
+  explicit WindowTypeLauncherView(mojo::Shell* shell)
+      : shell_(shell),
         create_button_(new views::LabelButton(
             this, base::ASCIIToUTF16("Create Window"))),
         panel_button_(new views::LabelButton(
             this, base::ASCIIToUTF16("Create Panel"))),
         create_nonresizable_button_(new views::LabelButton(
             this, base::ASCIIToUTF16("Create Non-Resizable Window"))),
         bubble_button_(new views::LabelButton(
             this, base::ASCIIToUTF16("Create Pointy Bubble"))),
         lock_button_(new views::LabelButton(
             this, base::ASCIIToUTF16("Lock Screen"))),
@@ skipping 88 matching lines @@
       NOTIMPLEMENTED();
     }
     else if (sender == create_nonresizable_button_) {
       NOTIMPLEMENTED();
     }
     else if (sender == bubble_button_) {
       NOTIMPLEMENTED();
     }
     else if (sender == lock_button_) {
       mash::shell::mojom::ShellPtr shell;
-      app_->ConnectToService("mojo:mash_shell", &shell);
+      shell_->ConnectToService("mojo:mash_shell", &shell);
       shell->LockScreen();
     }
     else if (sender == widgets_button_) {
       NOTIMPLEMENTED();
     }
     else if (sender == system_modal_button_) {
       ModalWindow::OpenModalWindow(GetWidget()->GetNativeView(),
                                    ui::MODAL_TYPE_SYSTEM);
     } else if (sender == window_modal_button_) {
       ModalWindow::OpenModalWindow(GetWidget()->GetNativeView(),
@@ skipping 36 matching lines @@
         root, MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));
     if (menu_runner_->RunMenuAt(GetWidget(),
                                 NULL,
                                 gfx::Rect(point, gfx::Size()),
                                 views::MENU_ANCHOR_TOPLEFT,
                                 source_type) == MenuRunner::MENU_DELETED) {
       return;
     }
   }
 
-  mojo::ApplicationImpl* app_;
+  mojo::Shell* shell_;
   views::LabelButton* create_button_;
   views::LabelButton* panel_button_;
   views::LabelButton* create_nonresizable_button_;
   views::LabelButton* bubble_button_;
   views::LabelButton* lock_button_;
   views::LabelButton* widgets_button_;
   views::LabelButton* system_modal_button_;
   views::LabelButton* window_modal_button_;
   views::LabelButton* child_modal_button_;
   views::LabelButton* transient_button_;
   views::LabelButton* examples_button_;
   views::LabelButton* show_hide_window_button_;
   views::LabelButton* show_web_notification_;
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncherView);
 };
 
 }  // namespace
 
 WindowTypeLauncher::WindowTypeLauncher() {}
 WindowTypeLauncher::~WindowTypeLauncher() {}
 
 bool WindowTypeLauncher::AcceptConnection(
     mojo::ApplicationConnection* connection) {
   return false;
 }
 
-void WindowTypeLauncher::Initialize(mojo::ApplicationImpl* app) {
-  aura_init_.reset(new views::AuraInit(app, "views_mus_resources.pak"));
+void WindowTypeLauncher::Initialize(mojo::Shell* shell, const std::string& url,
+                                    uint32_t id) {
+  aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak"));
 
-  views::WindowManagerConnection::Create(app);
+  views::WindowManagerConnection::Create(shell);
 
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
-  params.delegate = new WindowTypeLauncherView(app);
+  params.delegate = new WindowTypeLauncherView(shell);
   widget->Init(params);
   widget->Show();
 }