mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

OVERRIDE macro is now removed

Browse source
This commit is contained in:
Cheng Zhao 2015-01-09 17:24:36 -08:00
parent 13ed038082
commit 43421aedcf
26 changed files with 126 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

6
chromium_src/chrome/browser/printing/printing_message_filter.h
View file

@ -40,10 +40,10 @@ class PrintingMessageFilter : public content::BrowserMessageFilter {
PrintingMessageFilter(int render_process_id);
// content::BrowserMessageFilter methods.
virtual void OverrideThreadForMessage(
void OverrideThreadForMessage(
const IPC::Message& message,
content::BrowserThread::ID* thread) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
content::BrowserThread::ID* thread) override;
bool OnMessageReceived(const IPC::Message& message) override;
private:
virtual ~PrintingMessageFilter();

22
chromium_src/chrome/browser/speech/tts_message_filter.h
View file

@ -23,21 +23,21 @@ class TtsMessageFilter
content::BrowserContext* browser_context);
// content::BrowserMessageFilter implementation.
virtual void OverrideThreadForMessage(
void OverrideThreadForMessage(
const IPC::Message& message,
content::BrowserThread::ID* thread) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
virtual void OnChannelClosing() OVERRIDE;
virtual void OnDestruct() const OVERRIDE;
content::BrowserThread::ID* thread) override;
bool OnMessageReceived(const IPC::Message& message) override;
void OnChannelClosing() override;
void OnDestruct() const override;
// UtteranceEventDelegate implementation.
virtual void OnTtsEvent(Utterance* utterance,
TtsEventType event_type,
int char_index,
const std::string& error_message) OVERRIDE;
void OnTtsEvent(Utterance* utterance,
TtsEventType event_type,
int char_index,
const std::string& error_message) override;
// VoicesChangedDelegate implementation.
virtual void OnVoicesChanged() OVERRIDE;
void OnVoicesChanged() override;
private:
friend class content::BrowserThread;
@ -61,4 +61,4 @@ class TtsMessageFilter
DISALLOW_COPY_AND_ASSIGN(TtsMessageFilter);
};
#endif // CHROME_BROWSER_SPEECH_TTS_MESSAGE_FILTER_H_
#endif // CHROME_BROWSER_SPEECH_TTS_MESSAGE_FILTER_H_