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

OVERRIDE => override in native_window.h

Browse source
This commit is contained in:
Cheng Zhao 2014-10-27 16:47:50 +08:00
parent b3dc0bc57e
commit cf4c2d02f3
1 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

59
atom/browser/native_window.h
View file

@ -214,43 +214,42 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
const std::vector<DraggableRegion>& regions) = 0; const std::vector<DraggableRegion>& regions) = 0;
// Implementations of content::WebContentsDelegate. // Implementations of content::WebContentsDelegate.
virtual content::WebContents* OpenURLFromTab( content::WebContents* OpenURLFromTab(
content::WebContents* source, content::WebContents* source,
const content::OpenURLParams& params) OVERRIDE; const content::OpenURLParams& params) override;
virtual content::JavaScriptDialogManager* content::JavaScriptDialogManager* GetJavaScriptDialogManager() override;
GetJavaScriptDialogManager() OVERRIDE; void BeforeUnloadFired(content::WebContents* tab,
virtual void BeforeUnloadFired(content::WebContents* tab, bool proceed,
bool proceed, bool* proceed_to_fire_unload) override;
bool* proceed_to_fire_unload) OVERRIDE; void RequestToLockMouse(content::WebContents* web_contents,
virtual void RequestToLockMouse(content::WebContents* web_contents, bool user_gesture,
bool user_gesture, bool last_unlocked_by_target) override;
bool last_unlocked_by_target) OVERRIDE; bool CanOverscrollContent() const override;
virtual bool CanOverscrollContent() const OVERRIDE; void ActivateContents(content::WebContents* contents) override;
virtual void ActivateContents(content::WebContents* contents) OVERRIDE; void DeactivateContents(content::WebContents* contents) override;
virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; void MoveContents(content::WebContents* source,
virtual void MoveContents(content::WebContents* source, const gfx::Rect& pos) override;
const gfx::Rect& pos) OVERRIDE; void CloseContents(content::WebContents* source) override;
virtual void CloseContents(content::WebContents* source) OVERRIDE; bool IsPopupOrPanel(
virtual bool IsPopupOrPanel( const content::WebContents* source) const override;
const content::WebContents* source) const OVERRIDE; void RendererUnresponsive(content::WebContents* source) override;
virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; void RendererResponsive(content::WebContents* source) override;
virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
// Implementations of content::WebContentsObserver. // Implementations of content::WebContentsObserver.
virtual void BeforeUnloadFired(const base::TimeTicks& proceed_time) OVERRIDE; void BeforeUnloadFired(const base::TimeTicks& proceed_time) override;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; bool OnMessageReceived(const IPC::Message& message) override;
// Implementations of content::NotificationObserver. // Implementations of content::NotificationObserver.
virtual void Observe(int type, void Observe(int type,
const content::NotificationSource& source, const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE; const content::NotificationDetails& details) override;
// Implementations of brightray::InspectableWebContentsDelegate. // Implementations of brightray::InspectableWebContentsDelegate.
virtual void DevToolsSaveToFile(const std::string& url, void DevToolsSaveToFile(const std::string& url,
const std::string& content, const std::string& content,
bool save_as) OVERRIDE; bool save_as) override;
virtual void DevToolsAppendToFile(const std::string& url, void DevToolsAppendToFile(const std::string& url,
const std::string& content) OVERRIDE; const std::string& content) override;
// Whether window has standard frame. // Whether window has standard frame.
bool has_frame_; bool has_frame_;