[chromium-style] override / virtual warnings
This commit is contained in:
parent
a635f078c6
commit
e6695cf2ec
62 changed files with 106 additions and 106 deletions
|
@ -29,7 +29,7 @@ namespace extensions {
|
|||
class GlobalShortcutListenerMac : public GlobalShortcutListener {
|
||||
public:
|
||||
GlobalShortcutListenerMac();
|
||||
virtual ~GlobalShortcutListenerMac();
|
||||
~GlobalShortcutListenerMac() override;
|
||||
|
||||
private:
|
||||
typedef int KeyId;
|
||||
|
@ -42,11 +42,11 @@ class GlobalShortcutListenerMac : public GlobalShortcutListener {
|
|||
bool OnMediaOrVolumeKeyEvent(int key_code);
|
||||
|
||||
// GlobalShortcutListener implementation.
|
||||
virtual void StartListening() override;
|
||||
virtual void StopListening() override;
|
||||
virtual bool RegisterAcceleratorImpl(
|
||||
void StartListening() override;
|
||||
void StopListening() override;
|
||||
bool RegisterAcceleratorImpl(
|
||||
const ui::Accelerator& accelerator) override;
|
||||
virtual void UnregisterAcceleratorImpl(
|
||||
void UnregisterAcceleratorImpl(
|
||||
const ui::Accelerator& accelerator) override;
|
||||
|
||||
// Mac-specific functions for registering hot keys with modifiers.
|
||||
|
|
|
@ -34,7 +34,7 @@ class PrintQueriesQueue;
|
|||
class PrintViewManagerBase : public content::NotificationObserver,
|
||||
public content::WebContentsObserver {
|
||||
public:
|
||||
virtual ~PrintViewManagerBase();
|
||||
~PrintViewManagerBase() override;
|
||||
|
||||
#if !defined(DISABLE_BASIC_PRINTING)
|
||||
// Prints the current document immediately. Since the rendering is
|
||||
|
@ -70,12 +70,12 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
|||
|
||||
private:
|
||||
// content::NotificationObserver implementation.
|
||||
virtual void Observe(int type,
|
||||
const content::NotificationSource& source,
|
||||
const content::NotificationDetails& details) override;
|
||||
void Observe(int type,
|
||||
const content::NotificationSource& source,
|
||||
const content::NotificationDetails& details) override;
|
||||
|
||||
// Cancels the print job.
|
||||
virtual void NavigationStopped() override;
|
||||
void NavigationStopped() override;
|
||||
|
||||
// IPC Message handlers.
|
||||
void OnDidGetPrintedPagesCount(int cookie, int number_pages);
|
||||
|
|
|
@ -19,7 +19,7 @@ class PrintViewManagerBasic
|
|||
: public PrintViewManagerBase,
|
||||
public content::WebContentsUserData<PrintViewManagerBasic> {
|
||||
public:
|
||||
virtual ~PrintViewManagerBasic();
|
||||
~PrintViewManagerBasic() override;
|
||||
|
||||
#if defined(OS_ANDROID)
|
||||
// Sets the file descriptor into which the PDF will be written.
|
||||
|
|
|
@ -41,7 +41,7 @@ class PrintingMessageFilter : public content::BrowserMessageFilter {
|
|||
friend class base::DeleteHelper<PrintingMessageFilter>;
|
||||
friend class content::BrowserThread;
|
||||
|
||||
virtual ~PrintingMessageFilter();
|
||||
~PrintingMessageFilter() override;
|
||||
|
||||
void OnDestruct() const override;
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ class WidevineCdmMessageFilter : public content::BrowserMessageFilter {
|
|||
friend class content::BrowserThread;
|
||||
friend class base::DeleteHelper<WidevineCdmMessageFilter>;
|
||||
|
||||
virtual ~WidevineCdmMessageFilter();
|
||||
~WidevineCdmMessageFilter() override;
|
||||
|
||||
#if BUILDFLAG(ENABLE_LIBRARY_CDMS)
|
||||
// Returns whether any internal plugin supporting |mime_type| is registered
|
||||
|
|
|
@ -29,30 +29,30 @@ class TtsControllerImpl : public TtsController {
|
|||
static TtsControllerImpl* GetInstance();
|
||||
|
||||
// TtsController methods
|
||||
virtual bool IsSpeaking() override;
|
||||
virtual void SpeakOrEnqueue(Utterance* utterance) override;
|
||||
virtual void Stop() override;
|
||||
virtual void Pause() override;
|
||||
virtual void Resume() override;
|
||||
virtual void OnTtsEvent(int utterance_id,
|
||||
TtsEventType event_type,
|
||||
int char_index,
|
||||
const std::string& error_message) override;
|
||||
virtual void GetVoices(content::BrowserContext* browser_context,
|
||||
std::vector<VoiceData>* out_voices) override;
|
||||
virtual void VoicesChanged() override;
|
||||
virtual void AddVoicesChangedDelegate(
|
||||
bool IsSpeaking() override;
|
||||
void SpeakOrEnqueue(Utterance* utterance) override;
|
||||
void Stop() override;
|
||||
void Pause() override;
|
||||
void Resume() override;
|
||||
void OnTtsEvent(int utterance_id,
|
||||
TtsEventType event_type,
|
||||
int char_index,
|
||||
const std::string& error_message) override;
|
||||
void GetVoices(content::BrowserContext* browser_context,
|
||||
std::vector<VoiceData>* out_voices) override;
|
||||
void VoicesChanged() override;
|
||||
void AddVoicesChangedDelegate(
|
||||
VoicesChangedDelegate* delegate) override;
|
||||
virtual void RemoveVoicesChangedDelegate(
|
||||
void RemoveVoicesChangedDelegate(
|
||||
VoicesChangedDelegate* delegate) override;
|
||||
virtual void SetTtsEngineDelegate(TtsEngineDelegate* delegate) override;
|
||||
virtual TtsEngineDelegate* GetTtsEngineDelegate() override;
|
||||
virtual void SetPlatformImpl(TtsPlatformImpl* platform_impl) override;
|
||||
virtual int QueueSize() override;
|
||||
void SetTtsEngineDelegate(TtsEngineDelegate* delegate) override;
|
||||
TtsEngineDelegate* GetTtsEngineDelegate() override;
|
||||
void SetPlatformImpl(TtsPlatformImpl* platform_impl) override;
|
||||
int QueueSize() override;
|
||||
|
||||
protected:
|
||||
TtsControllerImpl();
|
||||
virtual ~TtsControllerImpl();
|
||||
~TtsControllerImpl() override;
|
||||
|
||||
private:
|
||||
// Get the platform TTS implementation (or injected mock).
|
||||
|
|
|
@ -49,26 +49,26 @@ class TtsPlatformImplMac;
|
|||
|
||||
class TtsPlatformImplMac : public TtsPlatformImpl {
|
||||
public:
|
||||
virtual bool PlatformImplAvailable() override {
|
||||
bool PlatformImplAvailable() override {
|
||||
return true;
|
||||
}
|
||||
|
||||
virtual bool Speak(
|
||||
bool Speak(
|
||||
int utterance_id,
|
||||
const std::string& utterance,
|
||||
const std::string& lang,
|
||||
const VoiceData& voice,
|
||||
const UtteranceContinuousParameters& params) override;
|
||||
|
||||
virtual bool StopSpeaking() override;
|
||||
bool StopSpeaking() override;
|
||||
|
||||
virtual void Pause() override;
|
||||
void Pause() override;
|
||||
|
||||
virtual void Resume() override;
|
||||
void Resume() override;
|
||||
|
||||
virtual bool IsSpeaking() override;
|
||||
bool IsSpeaking() override;
|
||||
|
||||
virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
|
||||
void GetVoices(std::vector<VoiceData>* out_voices) override;
|
||||
|
||||
// Called by ChromeTtsDelegate when we get a callback from the
|
||||
// native speech engine.
|
||||
|
@ -82,7 +82,7 @@ class TtsPlatformImplMac : public TtsPlatformImpl {
|
|||
|
||||
private:
|
||||
TtsPlatformImplMac();
|
||||
virtual ~TtsPlatformImplMac();
|
||||
~TtsPlatformImplMac() override;
|
||||
|
||||
base::scoped_nsobject<SingleUseSpeechSynthesizer> speech_synthesizer_;
|
||||
base::scoped_nsobject<ChromeTtsDelegate> delegate_;
|
||||
|
|
|
@ -41,7 +41,7 @@ class TtsMessageFilter : public content::BrowserMessageFilter,
|
|||
friend class content::BrowserThread;
|
||||
friend class base::DeleteHelper<TtsMessageFilter>;
|
||||
|
||||
virtual ~TtsMessageFilter();
|
||||
~TtsMessageFilter() override;
|
||||
|
||||
void OnInitializeVoiceList();
|
||||
void OnSpeak(const TtsUtteranceRequest& utterance);
|
||||
|
|
|
@ -39,14 +39,14 @@ class ColorChooserMac : public content::ColorChooser {
|
|||
SkColor initial_color);
|
||||
|
||||
ColorChooserMac(content::WebContents* tab, SkColor initial_color);
|
||||
virtual ~ColorChooserMac();
|
||||
~ColorChooserMac() override;
|
||||
|
||||
// Called from ColorPanelCocoa.
|
||||
void DidChooseColorInColorPanel(SkColor color);
|
||||
void DidCloseColorPabel();
|
||||
|
||||
virtual void End() override;
|
||||
virtual void SetSelectedColor(SkColor color) override;
|
||||
void End() override;
|
||||
void SetSelectedColor(SkColor color) override;
|
||||
|
||||
private:
|
||||
static ColorChooserMac* current_color_chooser_;
|
||||
|
|
|
@ -67,7 +67,7 @@ class PrintWebViewHelper
|
|||
public content::RenderFrameObserverTracker<PrintWebViewHelper> {
|
||||
public:
|
||||
explicit PrintWebViewHelper(content::RenderFrame* render_frame);
|
||||
virtual ~PrintWebViewHelper();
|
||||
~PrintWebViewHelper() override;
|
||||
|
||||
void PrintNode(const blink::WebNode& node);
|
||||
|
||||
|
|
|
@ -29,19 +29,19 @@ class TtsDispatcher : public blink::WebSpeechSynthesizer,
|
|||
public content::RenderThreadObserver {
|
||||
public:
|
||||
explicit TtsDispatcher(blink::WebSpeechSynthesizerClient* client);
|
||||
virtual ~TtsDispatcher();
|
||||
~TtsDispatcher() override;
|
||||
|
||||
private:
|
||||
// RenderProcessObserver override.
|
||||
virtual bool OnControlMessageReceived(const IPC::Message& message) override;
|
||||
bool OnControlMessageReceived(const IPC::Message& message) override;
|
||||
|
||||
// blink::WebSpeechSynthesizer implementation.
|
||||
virtual void UpdateVoiceList() override;
|
||||
virtual void Speak(
|
||||
const blink::WebSpeechSynthesisUtterance& utterance) override;
|
||||
virtual void Pause() override;
|
||||
virtual void Resume() override;
|
||||
virtual void Cancel() override;
|
||||
void UpdateVoiceList() override;
|
||||
void Speak(const blink::WebSpeechSynthesisUtterance& utterance)
|
||||
override;
|
||||
void Pause() override;
|
||||
void Resume() override;
|
||||
void Cancel() override;
|
||||
|
||||
blink::WebSpeechSynthesisUtterance FindUtterance(int utterance_id);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue