Remove GetDeprecatedAcceleratorImage().

This CL removes ash::ShellDelegate::GetDeprecatedAcceleratorImage().
This is only used in accelerator_controller.cc as an argument of
system_notifier::CreateSystemNotification(), which is ignored.

This CL also replaces system_notifier::CreateSystemNotification() by
message_center::Notification::CreateSystemNotification(), because the
former function just forwards to the latter.

IDR_BLUETOOTH_KEYBOARD is not removed, because it's still used in
chrome/browser/resources/chromeos/login/oobe_screen_hid_detection.html

BUG=757703

Change-Id: I92f5a982c817cec34f8d508a11cf813a1caec5fb
Reviewed-on: https://chromium-review.googlesource.com/826663Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524293}

ash/accelerators/accelerator_controller.cc

@@ -169,11 +169,10 @@ void ShowDeprecatedAcceleratorNotification(const char* const notification_id,
   const base::string16 message =
       GetNotificationText(message_id, old_shortcut_id, new_shortcut_id);
   std::unique_ptr<Notification> notification =
-      system_notifier::CreateSystemNotification(
+      message_center::Notification::CreateSystemNotification(
           message_center::NOTIFICATION_TYPE_SIMPLE, notification_id,
           l10n_util::GetStringUTF16(IDS_DEPRECATED_SHORTCUT_TITLE), message,
-          Shell::Get()->shell_delegate()->GetDeprecatedAcceleratorImage(),
-          base::string16(), GURL(),
+          gfx::Image(), base::string16(), GURL(),
           message_center::NotifierId(
               message_center::NotifierId::SYSTEM_COMPONENT,
               system_notifier::kNotifierDeprecatedAccelerator),

ash/shell/shell_delegate_impl.cc

@@ -78,10 +78,6 @@ base::string16 ShellDelegateImpl::GetProductName() const {
   return base::string16();
 }
 
-gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
-  return gfx::Image();
-}
-
 ui::InputDeviceControllerClient*
 ShellDelegateImpl::GetInputDeviceControllerClient() {
   return nullptr;

ash/shell/shell_delegate_impl.h

@@ -37,7 +37,6 @@ class ShellDelegateImpl : public ShellDelegate {
   std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
   AccessibilityDelegate* CreateAccessibilityDelegate() override;
   base::string16 GetProductName() const override;
-  gfx::Image GetDeprecatedAcceleratorImage() const override;
   ui::InputDeviceControllerClient* GetInputDeviceControllerClient() override;
 
  private:

ash/shell_delegate.h

@@ -18,10 +18,6 @@ namespace aura {
 class Window;
 }
 
-namespace gfx {
-class Image;
-}
-
 namespace keyboard {
 class KeyboardUI;
 }
@@ -93,8 +89,6 @@ class ASH_EXPORT ShellDelegate {
 
   virtual void OpenKeyboardShortcutHelpPage() const {}
 
-  virtual gfx::Image GetDeprecatedAcceleratorImage() const = 0;
-
   // Creator of Shell owns this; it's assumed this outlives Shell.
   virtual ui::InputDeviceControllerClient* GetInputDeviceControllerClient() = 0;
 };

ash/shell_delegate_mus.cc

@@ -109,11 +109,6 @@ base::string16 ShellDelegateMus::GetProductName() const {
   return base::string16();
 }
 
-gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
-  NOTIMPLEMENTED_LOG_ONCE();
-  return gfx::Image();
-}
-
 ui::InputDeviceControllerClient*
 ShellDelegateMus::GetInputDeviceControllerClient() {
   if (!connector_)

ash/shell_delegate_mus.h

@@ -35,7 +35,6 @@ class ShellDelegateMus : public ShellDelegate {
   std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
   AccessibilityDelegate* CreateAccessibilityDelegate() override;
   base::string16 GetProductName() const override;
-  gfx::Image GetDeprecatedAcceleratorImage() const override;
   ui::InputDeviceControllerClient* GetInputDeviceControllerClient() override;
 
  private:

ash/test_shell_delegate.cc

@@ -66,10 +66,6 @@ base::string16 TestShellDelegate::GetProductName() const {
   return base::string16();
 }
 
-gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const {
-  return gfx::Image();
-}
-
 ui::InputDeviceControllerClient*
 TestShellDelegate::GetInputDeviceControllerClient() {
   return nullptr;

ash/test_shell_delegate.h

@@ -31,7 +31,6 @@ class TestShellDelegate : public ShellDelegate {
   std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
   AccessibilityDelegate* CreateAccessibilityDelegate() override;
   base::string16 GetProductName() const override;
-  gfx::Image GetDeprecatedAcceleratorImage() const override;
   ui::InputDeviceControllerClient* GetInputDeviceControllerClient() override;
 
   void SetForceMaximizeOnFirstRun(bool maximize) {

chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -377,11 +377,6 @@ void ChromeShellDelegate::OpenKeyboardShortcutHelpPage() const {
   Navigate(&params);
 }
 
-gfx::Image ChromeShellDelegate::GetDeprecatedAcceleratorImage() const {
-  return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_BLUETOOTH_KEYBOARD);
-}
-
 std::unique_ptr<keyboard::KeyboardUI> ChromeShellDelegate::CreateKeyboardUI() {
   return base::MakeUnique<ChromeKeyboardUI>(
       ProfileManager::GetActiveUserProfile());

chrome/browser/ui/ash/chrome_shell_delegate.h

@@ -43,7 +43,6 @@ class ChromeShellDelegate : public ash::ShellDelegate,
   ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
   base::string16 GetProductName() const override;
   void OpenKeyboardShortcutHelpPage() const override;
-  gfx::Image GetDeprecatedAcceleratorImage() const override;
   ui::InputDeviceControllerClient* GetInputDeviceControllerClient() override;
 
   // content::NotificationObserver override: