OVERRIDE macro is now removed

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

View file

@ -19,10 +19,10 @@ class AtomContentClient : public brightray::ContentClient {
protected: protected:
// content::ContentClient: // content::ContentClient:
virtual std::string GetProduct() const OVERRIDE; std::string GetProduct() const override;
virtual void AddAdditionalSchemes( void AddAdditionalSchemes(
std::vector<std::string>* standard_schemes, std::vector<std::string>* standard_schemes,
std::vector<std::string>* savable_schemes) OVERRIDE; std::vector<std::string>* savable_schemes) override;
private: private:
DISALLOW_COPY_AND_ASSIGN(AtomContentClient); DISALLOW_COPY_AND_ASSIGN(AtomContentClient);

View file

@ -26,20 +26,20 @@ class AutoUpdater : public mate::EventEmitter,
virtual ~AutoUpdater(); virtual ~AutoUpdater();
// AutoUpdaterDelegate implementations. // AutoUpdaterDelegate implementations.
virtual void OnError(const std::string& error) OVERRIDE; void OnError(const std::string& error) override;
virtual void OnCheckingForUpdate() OVERRIDE; void OnCheckingForUpdate() override;
virtual void OnUpdateAvailable() OVERRIDE; void OnUpdateAvailable() override;
virtual void OnUpdateNotAvailable() OVERRIDE; void OnUpdateNotAvailable() override;
virtual void OnUpdateDownloaded( void OnUpdateDownloaded(
const std::string& release_notes, const std::string& release_notes,
const std::string& release_name, const std::string& release_name,
const base::Time& release_date, const base::Time& release_date,
const std::string& update_url, const std::string& update_url,
const base::Closure& quit_and_install) OVERRIDE; const base::Closure& quit_and_install) override;
// mate::Wrappable implementations: // mate::Wrappable implementations:
virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder( mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
v8::Isolate* isolate); v8::Isolate* isolate) override;
private: private:
void QuitAndInstall(); void QuitAndInstall();

View file

@ -28,8 +28,8 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
virtual ~GlobalShortcut(); virtual ~GlobalShortcut();
// mate::Wrappable implementations: // mate::Wrappable implementations:
virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder( mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
v8::Isolate* isolate) OVERRIDE; v8::Isolate* isolate) override;
private: private:
typedef std::map<ui::Accelerator, base::Closure> AcceleratorCallbackMap; typedef std::map<ui::Accelerator, base::Closure> AcceleratorCallbackMap;
@ -41,7 +41,7 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
void UnregisterAll(); void UnregisterAll();
// GlobalShortcutListener::Observer implementation. // GlobalShortcutListener::Observer implementation.
virtual void OnKeyPressed(const ui::Accelerator& accelerator) OVERRIDE; void OnKeyPressed(const ui::Accelerator& accelerator) override;
AcceleratorCallbackMap accelerator_callback_map_; AcceleratorCallbackMap accelerator_callback_map_;

View file

@ -19,8 +19,8 @@ class MenuMac : public Menu {
protected: protected:
MenuMac(); MenuMac();
virtual void Popup(Window* window) OVERRIDE; void Popup(Window* window) override;
virtual void PopupAt(Window* window, int x, int y) OVERRIDE; void PopupAt(Window* window, int x, int y) override;
base::scoped_nsobject<AtomMenuController> menu_controller_; base::scoped_nsobject<AtomMenuController> menu_controller_;

View file

@ -17,8 +17,8 @@ class MenuViews : public Menu {
MenuViews(); MenuViews();
protected: protected:
virtual void Popup(Window* window) OVERRIDE; void Popup(Window* window) override;
virtual void PopupAt(Window* window, int x, int y) OVERRIDE; void PopupAt(Window* window, int x, int y) override;
private: private:
void PopupAtPoint(Window* window, const gfx::Point& point); void PopupAtPoint(Window* window, const gfx::Point& point);

View file

@ -24,9 +24,9 @@ class PowerMonitor : public mate::EventEmitter,
virtual ~PowerMonitor(); virtual ~PowerMonitor();
// base::PowerObserver implementations: // base::PowerObserver implementations:
virtual void OnPowerStateChange(bool on_battery_power) OVERRIDE; void OnPowerStateChange(bool on_battery_power) override;
virtual void OnSuspend() OVERRIDE; void OnSuspend() override;
virtual void OnResume() OVERRIDE; void OnResume() override;
private: private:
DISALLOW_COPY_AND_ASSIGN(PowerMonitor); DISALLOW_COPY_AND_ASSIGN(PowerMonitor);

View file

@ -53,7 +53,7 @@ class CustomProtocolRequestJob : public AdapterRequestJob {
} }
// AdapterRequestJob: // AdapterRequestJob:
virtual void GetJobTypeInUI() OVERRIDE { void GetJobTypeInUI() override {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
v8::Isolate* isolate = v8::Isolate::GetCurrent(); v8::Isolate* isolate = v8::Isolate::GetCurrent();
@ -128,9 +128,9 @@ class CustomProtocolHandler : public ProtocolHandler {
: registry_(registry), protocol_handler_(protocol_handler) { : registry_(registry), protocol_handler_(protocol_handler) {
} }
virtual net::URLRequestJob* MaybeCreateJob( net::URLRequestJob* MaybeCreateJob(
net::URLRequest* request, net::URLRequest* request,
net::NetworkDelegate* network_delegate) const OVERRIDE { net::NetworkDelegate* network_delegate) const override {
return new CustomProtocolRequestJob(registry_, protocol_handler_.get(), return new CustomProtocolRequestJob(registry_, protocol_handler_.get(),
request, network_delegate); request, network_delegate);
} }

View file

@ -34,10 +34,10 @@ class Event : public Wrappable,
virtual ~Event(); virtual ~Event();
// Wrappable implementations: // Wrappable implementations:
virtual ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate* isolate); ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate* isolate) override;
// content::WebContentsObserver implementations: // content::WebContentsObserver implementations:
virtual void WebContentsDestroyed() OVERRIDE; void WebContentsDestroyed() override;
private: private:
// Replyer for the synchronous messages. // Replyer for the synchronous messages.

View file

@ -17,10 +17,10 @@ class AtomAccessTokenStore : public content::AccessTokenStore {
virtual ~AtomAccessTokenStore(); virtual ~AtomAccessTokenStore();
// content::AccessTokenStore: // content::AccessTokenStore:
virtual void LoadAccessTokens( void LoadAccessTokens(
const LoadAccessTokensCallbackType& callback) OVERRIDE; const LoadAccessTokensCallbackType& callback) override;
virtual void SaveAccessToken(const GURL& server_url, void SaveAccessToken(const GURL& server_url,
const base::string16& access_token) OVERRIDE; const base::string16& access_token) override;
private: private:
DISALLOW_COPY_AND_ASSIGN(AtomAccessTokenStore); DISALLOW_COPY_AND_ASSIGN(AtomAccessTokenStore);

View file

@ -27,14 +27,14 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
protected: protected:
// Implementations of brightray::BrowserMainParts. // Implementations of brightray::BrowserMainParts.
virtual brightray::BrowserContext* CreateBrowserContext() OVERRIDE; brightray::BrowserContext* CreateBrowserContext() override;
// Implementations of content::BrowserMainParts. // Implementations of content::BrowserMainParts.
virtual void PostEarlyInitialization() OVERRIDE; void PostEarlyInitialization() override;
virtual void PreMainMessageLoopRun() OVERRIDE; void PreMainMessageLoopRun() override;
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
virtual void PreMainMessageLoopStart() OVERRIDE; void PreMainMessageLoopStart() override;
virtual void PostDestroyThreads() OVERRIDE; void PostDestroyThreads() override;
#endif #endif
private: private:

View file

@ -14,7 +14,7 @@ namespace atom {
class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager { class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
public: public:
// content::JavaScriptDialogManager implementations. // content::JavaScriptDialogManager implementations.
virtual void RunJavaScriptDialog( void RunJavaScriptDialog(
content::WebContents* web_contents, content::WebContents* web_contents,
const GURL& origin_url, const GURL& origin_url,
const std::string& accept_lang, const std::string& accept_lang,
@ -22,16 +22,15 @@ class AtomJavaScriptDialogManager : public content::JavaScriptDialogManager {
const base::string16& message_text, const base::string16& message_text,
const base::string16& default_prompt_text, const base::string16& default_prompt_text,
const DialogClosedCallback& callback, const DialogClosedCallback& callback,
bool* did_suppress_message) OVERRIDE; bool* did_suppress_message) override;
virtual void RunBeforeUnloadDialog( void RunBeforeUnloadDialog(
content::WebContents* web_contents, content::WebContents* web_contents,
const base::string16& message_text, const base::string16& message_text,
bool is_reload, bool is_reload,
const DialogClosedCallback& callback) OVERRIDE; const DialogClosedCallback& callback) override;
virtual void CancelActiveAndPendingDialogs( void CancelActiveAndPendingDialogs(
content::WebContents* web_contents) OVERRIDE {} content::WebContents* web_contents) override {}
virtual void WebContentsDestroyed( void WebContentsDestroyed(content::WebContents* web_contents) override {}
content::WebContents* web_contents) OVERRIDE {}
}; };
} // namespace atom } // namespace atom

View file

@ -129,7 +129,7 @@ class NativeWindowClientView : public views::ClientView {
} }
virtual ~NativeWindowClientView() {} virtual ~NativeWindowClientView() {}
virtual bool CanClose() OVERRIDE { bool CanClose() override {
static_cast<NativeWindowViews*>(contents_view())->CloseWebContents(); static_cast<NativeWindowViews*>(contents_view())->CloseWebContents();
return false; return false;
} }

View file

@ -28,16 +28,16 @@ class AdapterRequestJob : public net::URLRequestJob {
public: public:
// net::URLRequestJob: // net::URLRequestJob:
virtual void Start() OVERRIDE; void Start() override;
virtual void Kill() OVERRIDE; void Kill() override;
virtual bool ReadRawData(net::IOBuffer* buf, bool ReadRawData(net::IOBuffer* buf,
int buf_size, int buf_size,
int *bytes_read) OVERRIDE; int *bytes_read) override;
virtual bool IsRedirectResponse(GURL* location, bool IsRedirectResponse(GURL* location,
int* http_status_code) OVERRIDE; int* http_status_code) override;
virtual net::Filter* SetupFilter() const OVERRIDE; net::Filter* SetupFilter() const override;
virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; bool GetMimeType(std::string* mime_type) const override;
virtual bool GetCharset(std::string* charset) OVERRIDE; bool GetCharset(std::string* charset) override;
base::WeakPtr<AdapterRequestJob> GetWeakPtr(); base::WeakPtr<AdapterRequestJob> GetWeakPtr();

View file

@ -27,10 +27,10 @@ class AsarProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
Archive* GetOrCreateAsarArchive(const base::FilePath& path) const; Archive* GetOrCreateAsarArchive(const base::FilePath& path) const;
// net::URLRequestJobFactory::ProtocolHandler: // net::URLRequestJobFactory::ProtocolHandler:
virtual net::URLRequestJob* MaybeCreateJob( net::URLRequestJob* MaybeCreateJob(
net::URLRequest* request, net::URLRequest* request,
net::NetworkDelegate* network_delegate) const OVERRIDE; net::NetworkDelegate* network_delegate) const override;
virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE; bool IsSafeRedirectTarget(const GURL& location) const override;
private: private:
const scoped_refptr<base::TaskRunner> file_task_runner_; const scoped_refptr<base::TaskRunner> file_task_runner_;

View file

@ -32,12 +32,12 @@ class URLRequestAsarJob : public net::URLRequestJob {
const scoped_refptr<base::TaskRunner>& file_task_runner); const scoped_refptr<base::TaskRunner>& file_task_runner);
// net::URLRequestJob: // net::URLRequestJob:
virtual void Start() OVERRIDE; void Start() override;
virtual void Kill() OVERRIDE; void Kill() override;
virtual bool ReadRawData(net::IOBuffer* buf, bool ReadRawData(net::IOBuffer* buf,
int buf_size, int buf_size,
int* bytes_read) OVERRIDE; int* bytes_read) override;
virtual bool GetMimeType(std::string* mime_type) const OVERRIDE; bool GetMimeType(std::string* mime_type) const override;
protected: protected:
virtual ~URLRequestAsarJob(); virtual ~URLRequestAsarJob();

View file

@ -40,13 +40,13 @@ class AtomURLRequestJobFactory : public net::URLRequestJobFactory {
bool HasProtocolHandler(const std::string& scheme) const; bool HasProtocolHandler(const std::string& scheme) const;
// URLRequestJobFactory implementation // URLRequestJobFactory implementation
virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler( net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
const std::string& scheme, const std::string& scheme,
net::URLRequest* request, net::URLRequest* request,
net::NetworkDelegate* network_delegate) const OVERRIDE; net::NetworkDelegate* network_delegate) const override;
virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE; bool IsHandledProtocol(const std::string& scheme) const override;
virtual bool IsHandledURL(const GURL& url) const OVERRIDE; bool IsHandledURL(const GURL& url) const override;
virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE; bool IsSafeRedirectTarget(const GURL& location) const override;
private: private:
typedef std::map<std::string, ProtocolHandler*> ProtocolHandlerMap; typedef std::map<std::string, ProtocolHandler*> ProtocolHandlerMap;

View file

@ -20,10 +20,10 @@ class URLRequestStringJob : public net::URLRequestSimpleJob {
const std::string& data); const std::string& data);
// URLRequestSimpleJob: // URLRequestSimpleJob:
virtual int GetData(std::string* mime_type, int GetData(std::string* mime_type,
std::string* charset, std::string* charset,
std::string* data, std::string* data,
const net::CompletionCallback& callback) const OVERRIDE; const net::CompletionCallback& callback) const override;
private: private:
std::string mime_type_; std::string mime_type_;

View file

@ -33,12 +33,12 @@ class NodeDebugger : public net::StreamListenSocket::Delegate {
static void DebugMessageHandler(const v8::Debug::Message& message); static void DebugMessageHandler(const v8::Debug::Message& message);
// net::StreamListenSocket::Delegate: // net::StreamListenSocket::Delegate:
virtual void DidAccept(net::StreamListenSocket* server, void DidAccept(net::StreamListenSocket* server,
scoped_ptr<net::StreamListenSocket> socket) OVERRIDE; scoped_ptr<net::StreamListenSocket> socket) override;
virtual void DidRead(net::StreamListenSocket* socket, void DidRead(net::StreamListenSocket* socket,
const char* data, const char* data,
int len) OVERRIDE; int len) override;
virtual void DidClose(net::StreamListenSocket* socket) OVERRIDE; void DidClose(net::StreamListenSocket* socket) override;
v8::Isolate* isolate_; v8::Isolate* isolate_;

View file

@ -22,12 +22,12 @@ class TrayIconCocoa : public TrayIcon {
TrayIconCocoa(); TrayIconCocoa();
virtual ~TrayIconCocoa(); virtual ~TrayIconCocoa();
virtual void SetImage(const gfx::Image& image) OVERRIDE; void SetImage(const gfx::Image& image) override;
virtual void SetPressedImage(const gfx::Image& image) OVERRIDE; void SetPressedImage(const gfx::Image& image) override;
virtual void SetToolTip(const std::string& tool_tip) OVERRIDE; void SetToolTip(const std::string& tool_tip) override;
virtual void SetTitle(const std::string& title) OVERRIDE; void SetTitle(const std::string& title) override;
virtual void SetHighlightMode(bool highlight) OVERRIDE; void SetHighlightMode(bool highlight) override;
virtual void SetContextMenu(ui::SimpleMenuModel* menu_model) OVERRIDE; void SetContextMenu(ui::SimpleMenuModel* menu_model) override;
private: private:
base::scoped_nsobject<NSStatusItem> item_; base::scoped_nsobject<NSStatusItem> item_;

View file

@ -23,14 +23,14 @@ class TrayIconGtk : public TrayIcon,
virtual ~TrayIconGtk(); virtual ~TrayIconGtk();
// TrayIcon: // TrayIcon:
virtual void SetImage(const gfx::Image& image) OVERRIDE; void SetImage(const gfx::Image& image) override;
virtual void SetToolTip(const std::string& tool_tip) OVERRIDE; void SetToolTip(const std::string& tool_tip) override;
virtual void SetContextMenu(ui::SimpleMenuModel* menu_model) OVERRIDE; void SetContextMenu(ui::SimpleMenuModel* menu_model) override;
private: private:
// views::StatusIconLinux::Delegate: // views::StatusIconLinux::Delegate:
virtual void OnClick() OVERRIDE; void OnClick() override;
virtual bool HasClickAction() OVERRIDE; bool HasClickAction() override;
scoped_ptr<views::StatusIconLinux> icon_; scoped_ptr<views::StatusIconLinux> icon_;

View file

@ -25,13 +25,13 @@ class CrashReporterLinux : public CrashReporter {
public: public:
static CrashReporterLinux* GetInstance(); static CrashReporterLinux* GetInstance();
virtual void InitBreakpad(const std::string& product_name, void InitBreakpad(const std::string& product_name,
const std::string& version, const std::string& version,
const std::string& company_name, const std::string& company_name,
const std::string& submit_url, const std::string& submit_url,
bool auto_submit, bool auto_submit,
bool skip_system_crash_handler) OVERRIDE; bool skip_system_crash_handler) override;
virtual void SetUploadParameters() OVERRIDE; void SetUploadParameters() override;
private: private:
friend struct DefaultSingletonTraits<CrashReporterLinux>; friend struct DefaultSingletonTraits<CrashReporterLinux>;

View file

@ -19,13 +19,13 @@ class CrashReporterMac : public CrashReporter {
public: public:
static CrashReporterMac* GetInstance(); static CrashReporterMac* GetInstance();
virtual void InitBreakpad(const std::string& product_name, void InitBreakpad(const std::string& product_name,
const std::string& version, const std::string& version,
const std::string& company_name, const std::string& company_name,
const std::string& submit_url, const std::string& submit_url,
bool auto_submit, bool auto_submit,
bool skip_system_crash_handler) OVERRIDE; bool skip_system_crash_handler) override;
virtual void SetUploadParameters() OVERRIDE; void SetUploadParameters() override;
private: private:
friend struct DefaultSingletonTraits<CrashReporterMac>; friend struct DefaultSingletonTraits<CrashReporterMac>;

View file

@ -21,13 +21,13 @@ class CrashReporterWin : public CrashReporter {
public: public:
static CrashReporterWin* GetInstance(); static CrashReporterWin* GetInstance();
virtual void InitBreakpad(const std::string& product_name, void InitBreakpad(const std::string& product_name,
const std::string& version, const std::string& version,
const std::string& company_name, const std::string& company_name,
const std::string& submit_url, const std::string& submit_url,
bool auto_submit, bool auto_submit,
bool skip_system_crash_handler) OVERRIDE; bool skip_system_crash_handler) override;
virtual void SetUploadParameters() OVERRIDE; void SetUploadParameters() override;
private: private:
friend struct DefaultSingletonTraits<CrashReporterWin>; friend struct DefaultSingletonTraits<CrashReporterWin>;

View file

@ -26,9 +26,9 @@ class AtomRenderViewObserver : public content::RenderViewObserver {
private: private:
// content::RenderViewObserver implementation. // content::RenderViewObserver implementation.
virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) OVERRIDE; void DidCreateDocumentElement(blink::WebLocalFrame* frame) override;
virtual void DraggableRegionsChanged(blink::WebFrame* frame) OVERRIDE; void DraggableRegionsChanged(blink::WebFrame* frame) override;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; bool OnMessageReceived(const IPC::Message& message) override;
void OnBrowserMessage(const base::string16& channel, void OnBrowserMessage(const base::string16& channel,
const base::ListValue& args); const base::ListValue& args);

View file

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

View file

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