Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / chrome_shell_delegate_views.cc

diff --git a/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
index c9b16cf..38b1343 100644 (file)
--- a/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/src/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -7,9 +7,7 @@
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
-#include "ash/magnifier/magnifier_constants.h"
 #include "ash/media_delegate.h"
-#include "ash/system/tray/default_system_tray_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/accessibility/accessibility_events.h"
@@ -23,6 +21,7 @@
 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h"
 #include "chrome/browser/ui/ash/session_state_delegate_views.h"
 #include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h"
+#include "chrome/browser/ui/ash/system_tray_delegate_common.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -33,26 +32,19 @@
 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
-
-#if defined(OS_WIN)
-#include "chrome/browser/ui/ash/system_tray_delegate_win.h"
-#endif
-
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#include "chrome/browser/ui/ash/system_tray_delegate_linux.h"
-#endif
+#include "ui/chromeos/accessibility_types.h"
 
 namespace {
 
 class NewWindowDelegateImpl : public ChromeNewWindowDelegate {
  public:
   NewWindowDelegateImpl() {}
-  virtual ~NewWindowDelegateImpl() {}
+  ~NewWindowDelegateImpl() override {}
 
   // Overridden from ash::NewWindowDelegate:
-  virtual void OpenFileManager() OVERRIDE {}
-  virtual void OpenCrosh() OVERRIDE {}
-  virtual void ShowKeyboardOverlay() OVERRIDE {}
+  void OpenFileManager() override {}
+  void OpenCrosh() override {}
+  void ShowKeyboardOverlay() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl);
@@ -61,12 +53,12 @@ class NewWindowDelegateImpl : public ChromeNewWindowDelegate {
 class MediaDelegateImpl : public ash::MediaDelegate {
  public:
   MediaDelegateImpl() {}
-  virtual ~MediaDelegateImpl() {}
-  virtual void HandleMediaNextTrack() OVERRIDE {}
-  virtual void HandleMediaPlayPause() OVERRIDE {}
-  virtual void HandleMediaPrevTrack() OVERRIDE {}
-  virtual ash::MediaCaptureState GetMediaCaptureState(
-      content::BrowserContext* context) OVERRIDE {
+  ~MediaDelegateImpl() override {}
+  void HandleMediaNextTrack() override {}
+  void HandleMediaPlayPause() override {}
+  void HandleMediaPrevTrack() override {}
+  ash::MediaCaptureState GetMediaCaptureState(
+      content::BrowserContext* context) override {
     return ash::MEDIA_CAPTURE_NONE;
   }
 
@@ -77,86 +69,60 @@ class MediaDelegateImpl : public ash::MediaDelegate {
 class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate {
  public:
   EmptyAccessibilityDelegate() {}
-  virtual ~EmptyAccessibilityDelegate() {}
+  ~EmptyAccessibilityDelegate() override {}
 
-  virtual void ToggleHighContrast() OVERRIDE {
-  }
+  void ToggleHighContrast() override {}
 
-  virtual bool IsHighContrastEnabled() const OVERRIDE {
-    return false;
-  }
+  bool IsHighContrastEnabled() const override { return false; }
 
-  virtual bool IsSpokenFeedbackEnabled() const OVERRIDE {
-    return false;
-  }
+  bool IsSpokenFeedbackEnabled() const override { return false; }
 
-  virtual void ToggleSpokenFeedback(
-      ash::AccessibilityNotificationVisibility notify) OVERRIDE {
-  }
+  void ToggleSpokenFeedback(
+      ui::AccessibilityNotificationVisibility notify) override {}
 
-  virtual void SetLargeCursorEnabled(bool enalbed) OVERRIDE {
-  }
+  void SetLargeCursorEnabled(bool enalbed) override {}
 
-  virtual bool IsLargeCursorEnabled() const OVERRIDE {
-    return false;
-  }
+  bool IsLargeCursorEnabled() const override { return false; }
 
-  virtual void SetMagnifierEnabled(bool enabled) OVERRIDE {
-  }
+  void SetMagnifierEnabled(bool enabled) override {}
 
-  virtual void SetMagnifierType(ash::MagnifierType type) OVERRIDE {
-  }
+  void SetMagnifierType(ui::MagnifierType type) override {}
 
-  virtual bool IsMagnifierEnabled() const OVERRIDE {
-    return false;
-  }
+  bool IsMagnifierEnabled() const override { return false; }
 
-  virtual void SetAutoclickEnabled(bool enabled) OVERRIDE {
-  }
+  void SetAutoclickEnabled(bool enabled) override {}
 
-  virtual bool IsAutoclickEnabled() const OVERRIDE {
-    return false;
-  }
+  bool IsAutoclickEnabled() const override { return false; }
 
-  virtual ash::MagnifierType GetMagnifierType() const OVERRIDE {
-    return ash::kDefaultMagnifierType;
+  ui::MagnifierType GetMagnifierType() const override {
+    return ui::kDefaultMagnifierType;
   }
 
-  virtual void SaveScreenMagnifierScale(double scale) OVERRIDE {
-  }
+  void SaveScreenMagnifierScale(double scale) override {}
 
-  virtual double GetSavedScreenMagnifierScale() OVERRIDE {
+  double GetSavedScreenMagnifierScale() override {
     return std::numeric_limits<double>::min();
   }
 
-  virtual bool ShouldShowAccessibilityMenu() const OVERRIDE {
-    return false;
-  }
+  bool ShouldShowAccessibilityMenu() const override { return false; }
 
-  virtual bool IsBrailleDisplayConnected() const OVERRIDE { return false; }
+  bool IsBrailleDisplayConnected() const override { return false; }
 
-  virtual void SilenceSpokenFeedback() const OVERRIDE {
-  }
+  void SilenceSpokenFeedback() const override {}
 
-  virtual void SetVirtualKeyboardEnabled(bool enabled) OVERRIDE {
-  }
+  void SetVirtualKeyboardEnabled(bool enabled) override {}
 
-  virtual bool IsVirtualKeyboardEnabled() const OVERRIDE {
-    return false;
-  }
+  bool IsVirtualKeyboardEnabled() const override { return false; }
 
-  virtual void TriggerAccessibilityAlert(
-      ash::AccessibilityAlert alert) OVERRIDE {
-  }
+  void TriggerAccessibilityAlert(ui::AccessibilityAlert alert) override {}
 
-  virtual ash::AccessibilityAlert GetLastAccessibilityAlert() OVERRIDE {
-    return ash::A11Y_ALERT_NONE;
+  ui::AccessibilityAlert GetLastAccessibilityAlert() override {
+    return ui::A11Y_ALERT_NONE;
   }
 
-  virtual void PlayEarcon(int sound_key) OVERRIDE {
-  }
+  void PlayEarcon(int sound_key) override {}
 
-  virtual base::TimeDelta PlayShutdownSound() const OVERRIDE {
+  base::TimeDelta PlayShutdownSound() const override {
     return base::TimeDelta();
   }
 
@@ -189,13 +155,7 @@ ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {
 }
 
 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
-#if defined(OS_WIN)
-  return CreateWindowsSystemTrayDelegate();
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  return CreateLinuxSystemTrayDelegate();
-#else
-  return new ash::DefaultSystemTrayDelegate;
-#endif
+  return new SystemTrayDelegateCommon();
 }
 
 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() {