Rename ApplicationDelegate to ShellClient

mash/wallpaper/wallpaper.cc

 // 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.
 
 #include "base/macros.h"
 #include "components/filesystem/public/cpp/prefs/pref_service_factory.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
-#include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/application_runner.h"
 #include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/shell_client.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mash {
 namespace wallpaper {
 namespace {
 
 class Wallpaper : public views::WidgetDelegateView {
  public:
   Wallpaper() {}
   ~Wallpaper() override {}
 
   // Overridden from views::View:
   void OnPaint(gfx::Canvas* canvas) override {
     canvas->FillRect(GetLocalBounds(), SK_ColorRED);
   }
 
   // Overridden from views::WidgetDelegate:
   views::View* GetContentsView() override { return this; }
 
   DISALLOW_COPY_AND_ASSIGN(Wallpaper);
 };
 
-class WallpaperApplicationDelegate : public mojo::ApplicationDelegate {
+class WallpaperApplicationDelegate : public mojo::ShellClient {
  public:
   WallpaperApplicationDelegate() {}
   ~WallpaperApplicationDelegate() override {}
 
   void OnLoaded(bool whatever) {
     // TODO(erg): Now do something with this result.
   }
 
  private:
-  // mojo::ApplicationDelegate:
+  // mojo::ShellClient:
   void Initialize(mojo::Shell* shell, const std::string& url,
                   uint32_t id) override {
     tracing_.Initialize(shell, url);
 
     aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak"));
     views::WindowManagerConnection::Create(shell);
 
     scoped_refptr<PrefRegistrySimple> registry = new PrefRegistrySimple;
     registry->RegisterStringPref("filename", "", 0);
     pref_service_ = filesystem::CreatePrefService(shell, registry.get());
@@ skipping 26 matching lines @@
 
 }  // namespace
 }  // namespace wallpaper
 }  // namespace mash
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunner runner(
       new mash::wallpaper::WallpaperApplicationDelegate);
   return runner.Run(shell_handle);
 }