| Index: chrome/browser/ui/ash/chrome_shell_delegate_views.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
|
| index 57a5099ad9955e1def2b653e7730c75f1b6ab2fb..8423df8505155e97268f3a541bbf0bc748c041b6 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
|
| @@ -39,12 +39,12 @@ 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);
|
| @@ -53,11 +53,11 @@ 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(
|
| + ~MediaDelegateImpl() override {}
|
| + void HandleMediaNextTrack() override {}
|
| + void HandleMediaPlayPause() override {}
|
| + void HandleMediaPrevTrack() override {}
|
| + ash::MediaCaptureState GetMediaCaptureState(
|
| content::BrowserContext* context) override {
|
| return ash::MEDIA_CAPTURE_NONE;
|
| }
|
| @@ -69,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(
|
| + ash::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(ash::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 {
|
| + ash::MagnifierType GetMagnifierType() const override {
|
| return ash::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(ash::AccessibilityAlert alert) override {}
|
|
|
| - virtual ash::AccessibilityAlert GetLastAccessibilityAlert() override {
|
| + ash::AccessibilityAlert GetLastAccessibilityAlert() override {
|
| return ash::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();
|
| }
|
|
|
|
|