mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash.

ash/shell/shell_delegate_impl.cc

Index: ash/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 3f63ee14d190394cf032038578258e7787810218..f2e5ef09172f8bb27919442ec2eda0a342b569d1 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -15,7 +15,7 @@
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/default_system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
-#include "ash/default_user_wallpaper_delegate.h"
+#include "ash/default_wallpaper_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell/context_menu.h"
 #include "ash/shell/example_factory.h"
@@ -45,10 +45,10 @@ class NewWindowDelegateImpl : public NewWindowDelegate {
   // NewWindowDelegate:
   void NewTab() override {}
   void NewWindow(bool incognito) override {
-    ash::shell::ToplevelWindow::CreateParams create_params;
+    ToplevelWindow::CreateParams create_params;
     create_params.can_resize = true;
     create_params.can_maximize = true;
-    ash::shell::ToplevelWindow::CreateToplevelWindow(create_params);
+    ToplevelWindow::CreateToplevelWindow(create_params);
   }
   void OpenFileManager() override {}
   void OpenCrosh() override {}
@@ -143,9 +143,8 @@ class SessionStateDelegateImpl : public SessionStateDelegate {
   bool IsMultiProfileAllowedByPrimaryUserPolicy() const override {
     return true;
   }
-  void AddSessionStateObserver(ash::SessionStateObserver* observer) override {}
-  void RemoveSessionStateObserver(
-      ash::SessionStateObserver* observer) override {}
+  void AddSessionStateObserver(SessionStateObserver* observer) override {}
+  void RemoveSessionStateObserver(SessionStateObserver* observer) override {}
 
  private:
   bool screen_locked_;
@@ -235,27 +234,28 @@ ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) {
   return shelf_delegate_;
 }
 
-ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() {
+SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() {
   return new DefaultSystemTrayDelegate;
 }
 
-ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() {
-  return new DefaultUserWallpaperDelegate();
+std::unique_ptr<WallpaperDelegate>
+ShellDelegateImpl::CreateWallpaperDelegate() {
+  return base::MakeUnique<DefaultWallpaperDelegate>();
 }
 
-ash::SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() {
+SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() {
   return new SessionStateDelegateImpl;
 }
 
-ash::AccessibilityDelegate* ShellDelegateImpl::CreateAccessibilityDelegate() {
+AccessibilityDelegate* ShellDelegateImpl::CreateAccessibilityDelegate() {
   return new DefaultAccessibilityDelegate;
 }
 
-ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() {
+NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() {
   return new NewWindowDelegateImpl;
 }
 
-ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() {
+MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() {
   return new MediaDelegateImpl;
 }