Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate_views.cc

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/accessibility_delegate.h" 9 #include "ash/accessibility_delegate.h"
10 #include "ash/magnifier/magnifier_constants.h" 10 #include "ash/magnifier/magnifier_constants.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #endif 43 #endif
44 44
45 namespace { 45 namespace {
46 46
47 class NewWindowDelegateImpl : public ChromeNewWindowDelegate { 47 class NewWindowDelegateImpl : public ChromeNewWindowDelegate {
48 public: 48 public:
49 NewWindowDelegateImpl() {} 49 NewWindowDelegateImpl() {}
50 virtual ~NewWindowDelegateImpl() {} 50 virtual ~NewWindowDelegateImpl() {}
51 51
52 // Overridden from ash::NewWindowDelegate: 52 // Overridden from ash::NewWindowDelegate:
53 virtual void OpenFileManager() OVERRIDE {} 53 virtual void OpenFileManager() override {}
54 virtual void OpenCrosh() OVERRIDE {} 54 virtual void OpenCrosh() override {}
55 virtual void ShowKeyboardOverlay() OVERRIDE {} 55 virtual void ShowKeyboardOverlay() override {}
56 56
57 private: 57 private:
58 DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl); 58 DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl);
59 }; 59 };
60 60
61 class MediaDelegateImpl : public ash::MediaDelegate { 61 class MediaDelegateImpl : public ash::MediaDelegate {
62 public: 62 public:
63 MediaDelegateImpl() {} 63 MediaDelegateImpl() {}
64 virtual ~MediaDelegateImpl() {} 64 virtual ~MediaDelegateImpl() {}
65 virtual void HandleMediaNextTrack() OVERRIDE {} 65 virtual void HandleMediaNextTrack() override {}
66 virtual void HandleMediaPlayPause() OVERRIDE {} 66 virtual void HandleMediaPlayPause() override {}
67 virtual void HandleMediaPrevTrack() OVERRIDE {} 67 virtual void HandleMediaPrevTrack() override {}
68 virtual ash::MediaCaptureState GetMediaCaptureState( 68 virtual ash::MediaCaptureState GetMediaCaptureState(
69 content::BrowserContext* context) OVERRIDE { 69 content::BrowserContext* context) override {
70 return ash::MEDIA_CAPTURE_NONE; 70 return ash::MEDIA_CAPTURE_NONE;
71 } 71 }
72 72
73 private: 73 private:
74 DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl); 74 DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl);
75 }; 75 };
76 76
77 class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate { 77 class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate {
78 public: 78 public:
79 EmptyAccessibilityDelegate() {} 79 EmptyAccessibilityDelegate() {}
80 virtual ~EmptyAccessibilityDelegate() {} 80 virtual ~EmptyAccessibilityDelegate() {}
81 81
82 virtual void ToggleHighContrast() OVERRIDE { 82 virtual void ToggleHighContrast() override {
83 } 83 }
84 84
85 virtual bool IsHighContrastEnabled() const OVERRIDE { 85 virtual bool IsHighContrastEnabled() const override {
86 return false; 86 return false;
87 } 87 }
88 88
89 virtual bool IsSpokenFeedbackEnabled() const OVERRIDE { 89 virtual bool IsSpokenFeedbackEnabled() const override {
90 return false; 90 return false;
91 } 91 }
92 92
93 virtual void ToggleSpokenFeedback( 93 virtual void ToggleSpokenFeedback(
94 ash::AccessibilityNotificationVisibility notify) OVERRIDE { 94 ash::AccessibilityNotificationVisibility notify) override {
95 } 95 }
96 96
97 virtual void SetLargeCursorEnabled(bool enalbed) OVERRIDE { 97 virtual void SetLargeCursorEnabled(bool enalbed) override {
98 } 98 }
99 99
100 virtual bool IsLargeCursorEnabled() const OVERRIDE { 100 virtual bool IsLargeCursorEnabled() const override {
101 return false; 101 return false;
102 } 102 }
103 103
104 virtual void SetMagnifierEnabled(bool enabled) OVERRIDE { 104 virtual void SetMagnifierEnabled(bool enabled) override {
105 } 105 }
106 106
107 virtual void SetMagnifierType(ash::MagnifierType type) OVERRIDE { 107 virtual void SetMagnifierType(ash::MagnifierType type) override {
108 } 108 }
109 109
110 virtual bool IsMagnifierEnabled() const OVERRIDE { 110 virtual bool IsMagnifierEnabled() const override {
111 return false; 111 return false;
112 } 112 }
113 113
114 virtual void SetAutoclickEnabled(bool enabled) OVERRIDE { 114 virtual void SetAutoclickEnabled(bool enabled) override {
115 } 115 }
116 116
117 virtual bool IsAutoclickEnabled() const OVERRIDE { 117 virtual bool IsAutoclickEnabled() const override {
118 return false; 118 return false;
119 } 119 }
120 120
121 virtual ash::MagnifierType GetMagnifierType() const OVERRIDE { 121 virtual ash::MagnifierType GetMagnifierType() const override {
122 return ash::kDefaultMagnifierType; 122 return ash::kDefaultMagnifierType;
123 } 123 }
124 124
125 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE { 125 virtual void SaveScreenMagnifierScale(double scale) override {
126 } 126 }
127 127
128 virtual double GetSavedScreenMagnifierScale() OVERRIDE { 128 virtual double GetSavedScreenMagnifierScale() override {
129 return std::numeric_limits<double>::min(); 129 return std::numeric_limits<double>::min();
130 } 130 }
131 131
132 virtual bool ShouldShowAccessibilityMenu() const OVERRIDE { 132 virtual bool ShouldShowAccessibilityMenu() const override {
133 return false; 133 return false;
134 } 134 }
135 135
136 virtual bool IsBrailleDisplayConnected() const OVERRIDE { return false; } 136 virtual bool IsBrailleDisplayConnected() const override { return false; }
137 137
138 virtual void SilenceSpokenFeedback() const OVERRIDE { 138 virtual void SilenceSpokenFeedback() const override {
139 } 139 }
140 140
141 virtual void SetVirtualKeyboardEnabled(bool enabled) OVERRIDE { 141 virtual void SetVirtualKeyboardEnabled(bool enabled) override {
142 } 142 }
143 143
144 virtual bool IsVirtualKeyboardEnabled() const OVERRIDE { 144 virtual bool IsVirtualKeyboardEnabled() const override {
145 return false; 145 return false;
146 } 146 }
147 147
148 virtual void TriggerAccessibilityAlert( 148 virtual void TriggerAccessibilityAlert(
149 ash::AccessibilityAlert alert) OVERRIDE { 149 ash::AccessibilityAlert alert) override {
150 } 150 }
151 151
152 virtual ash::AccessibilityAlert GetLastAccessibilityAlert() OVERRIDE { 152 virtual ash::AccessibilityAlert GetLastAccessibilityAlert() override {
153 return ash::A11Y_ALERT_NONE; 153 return ash::A11Y_ALERT_NONE;
154 } 154 }
155 155
156 virtual void PlayEarcon(int sound_key) OVERRIDE { 156 virtual void PlayEarcon(int sound_key) override {
157 } 157 }
158 158
159 virtual base::TimeDelta PlayShutdownSound() const OVERRIDE { 159 virtual base::TimeDelta PlayShutdownSound() const override {
160 return base::TimeDelta(); 160 return base::TimeDelta();
161 } 161 }
162 162
163 private: 163 private:
164 DISALLOW_COPY_AND_ASSIGN(EmptyAccessibilityDelegate); 164 DISALLOW_COPY_AND_ASSIGN(EmptyAccessibilityDelegate);
165 }; 165 };
166 166
167 } // namespace 167 } // namespace
168 168
169 bool ChromeShellDelegate::IsFirstRunAfterBoot() const { 169 bool ChromeShellDelegate::IsFirstRunAfterBoot() const {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 chrome::NOTIFICATION_PROFILE_ADDED, 284 chrome::NOTIFICATION_PROFILE_ADDED,
285 content::NotificationService::AllSources()); 285 content::NotificationService::AllSources());
286 registrar_.Add(this, 286 registrar_.Add(this,
287 chrome::NOTIFICATION_ASH_SESSION_STARTED, 287 chrome::NOTIFICATION_ASH_SESSION_STARTED,
288 content::NotificationService::AllSources()); 288 content::NotificationService::AllSources());
289 registrar_.Add(this, 289 registrar_.Add(this,
290 chrome::NOTIFICATION_ASH_SESSION_ENDED, 290 chrome::NOTIFICATION_ASH_SESSION_ENDED,
291 content::NotificationService::AllSources()); 291 content::NotificationService::AllSources());
292 #endif 292 #endif
293 } 293 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/ime_controller_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698