Remove MOJO_SHELL_CLIENT define.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

 // Copyright 2014 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 "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 
 #include <stdint.h>
 #include <numeric>
 #include <utility>
 #include <vector>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
+#include "ash/sysui/public/interfaces/wallpaper.mojom.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/sha1.h"
@@ skipping 33 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skia_util.h"
 
-#if defined(MOJO_SHELL_CLIENT)
-#include "ash/sysui/public/interfaces/wallpaper.mojom.h"
-#endif
-
 using content::BrowserThread;
 using wallpaper::WallpaperManagerBase;
 using wallpaper::WallpaperInfo;
 using wallpaper::MovableOnDestroyCallback;
 using wallpaper::MovableOnDestroyCallbackHolder;
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 90 matching lines @@
   return wallpaper::WallpaperFilesId::FromString(result);
 }
 
 void SetKnownUserWallpaperFilesId(
     const AccountId& account_id,
     const wallpaper::WallpaperFilesId& wallpaper_files_id) {
   user_manager::known_user::SetStringPref(account_id, kWallpaperFilesId,
                                           wallpaper_files_id.id());
 }
 
-#if defined(MOJO_SHELL_CLIENT)
 ash::sysui::mojom::WallpaperLayout WallpaperLayoutToMojo(
     wallpaper::WallpaperLayout layout) {
   switch (layout) {
     case wallpaper::WALLPAPER_LAYOUT_CENTER:
       return ash::sysui::mojom::WallpaperLayout::CENTER;
     case wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED:
       return ash::sysui::mojom::WallpaperLayout::CENTER_CROPPED;
     case wallpaper::WALLPAPER_LAYOUT_STRETCH:
       return ash::sysui::mojom::WallpaperLayout::STRETCH;
     case wallpaper::WALLPAPER_LAYOUT_TILE:
       return ash::sysui::mojom::WallpaperLayout::TILE;
     case wallpaper::NUM_WALLPAPER_LAYOUT:
       NOTREACHED();
       return ash::sysui::mojom::WallpaperLayout::CENTER;
   }
   NOTREACHED();
   return ash::sysui::mojom::WallpaperLayout::CENTER;
 }
-#endif
 
 // A helper to set the wallpaper image for Ash and Mash.
 void SetWallpaper(const gfx::ImageSkia& image,
                   wallpaper::WallpaperLayout layout) {
-#if defined(MOJO_SHELL_CLIENT)
   if (chrome::IsRunningInMash()) {
     shell::Connector* connector =
         content::MojoShellConnection::GetForProcess()->GetConnector();
     ash::sysui::mojom::WallpaperControllerPtr wallpaper_controller;
     connector->ConnectToInterface("mojo:ash_sysui", &wallpaper_controller);
     wallpaper_controller->SetWallpaper(*image.bitmap(),
                                        WallpaperLayoutToMojo(layout));
     return;
   }
-#endif
   // Avoid loading unnecessary wallpapers in tests without a shell instance.
   if (ash::Shell::HasInstance()) {
     ash::Shell::GetInstance()
         ->desktop_background_controller()
         ->SetWallpaperImage(image, layout);
   }
 }
 
 }  // namespace
 
@@ skipping 945 matching lines @@
                                               &stored_value)) {
     return wallpaper::WallpaperFilesId::FromString(stored_value);
   }
   const std::string& old_id = account_id.GetUserEmail();  // Migrated
   const wallpaper::WallpaperFilesId files_id = HashWallpaperFilesIdStr(old_id);
   SetKnownUserWallpaperFilesId(account_id, files_id);
   return files_id;
 }
 
 }  // namespace chromeos