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

No need for "virtual" when "override" is used

Browse source
This commit is contained in:
Cheng Zhao 2014-10-27 16:37:51 +08:00
parent f809fef22d
commit 7b39673215
1 changed files with 46 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
brightray/browser/inspectable_web_contents_impl.h
View file

@ -41,12 +41,12 @@ class InspectableWebContentsImpl :
explicit InspectableWebContentsImpl(content::WebContents*); explicit InspectableWebContentsImpl(content::WebContents*);
virtual ~InspectableWebContentsImpl(); virtual ~InspectableWebContentsImpl();
virtual InspectableWebContentsView* GetView() const override; InspectableWebContentsView* GetView() const override;
virtual content::WebContents* GetWebContents() const override; content::WebContents* GetWebContents() const override;
virtual void ShowDevTools() override; void ShowDevTools() override;
virtual void CloseDevTools() override; void CloseDevTools() override;
virtual bool IsDevToolsViewShowing() override; bool IsDevToolsViewShowing() override;
// Return the last position and size of devtools window. // Return the last position and size of devtools window.
gfx::Rect GetDevToolsBounds() const; gfx::Rect GetDevToolsBounds() const;
@ -65,59 +65,57 @@ class InspectableWebContentsImpl :
private: private:
// DevToolsEmbedderMessageDispacher::Delegate // DevToolsEmbedderMessageDispacher::Delegate
void ActivateWindow() override;
virtual void ActivateWindow() override; void CloseWindow() override;
virtual void CloseWindow() override; void SetInspectedPageBounds(const gfx::Rect& rect) override;
virtual void SetInspectedPageBounds(const gfx::Rect& rect) override; void InspectElementCompleted() override;
virtual void InspectElementCompleted() override; void MoveWindow(int x, int y) override;
virtual void MoveWindow(int x, int y) override; void SetIsDocked(bool docked) override;
virtual void SetIsDocked(bool docked) override; void OpenInNewTab(const std::string& url) override;
virtual void OpenInNewTab(const std::string& url) override; void SaveToFile(const std::string& url,
virtual void SaveToFile(const std::string& url,
const std::string& content, const std::string& content,
bool save_as) override; bool save_as) override;
virtual void AppendToFile(const std::string& url, void AppendToFile(const std::string& url,
const std::string& content) override; const std::string& content) override;
virtual void RequestFileSystems() override; void RequestFileSystems() override;
virtual void AddFileSystem() override; void AddFileSystem() override;
virtual void RemoveFileSystem(const std::string& file_system_path) override; void RemoveFileSystem(const std::string& file_system_path) override;
virtual void UpgradeDraggedFileSystemPermissions( void UpgradeDraggedFileSystemPermissions(
const std::string& file_system_url) override; const std::string& file_system_url) override;
virtual void IndexPath(int request_id, void IndexPath(int request_id,
const std::string& file_system_path) override; const std::string& file_system_path) override;
virtual void StopIndexing(int request_id) override; void StopIndexing(int request_id) override;
virtual void SearchInPath(int request_id, void SearchInPath(int request_id,
const std::string& file_system_path, const std::string& file_system_path,
const std::string& query) override; const std::string& query) override;
virtual void ZoomIn() override; void ZoomIn() override;
virtual void ZoomOut() override; void ZoomOut() override;
virtual void ResetZoom() override; void ResetZoom() override;
// content::DevToolsClientHost: // content::DevToolsClientHost:
virtual void DispatchOnInspectorFrontend(const std::string& message) override; void DispatchOnInspectorFrontend(const std::string& message) override;
virtual void InspectedContentsClosing() override; void InspectedContentsClosing() override;
virtual void ReplacedWithAnotherClient() override; void ReplacedWithAnotherClient() override;
// content::DevToolsFrontendHostDelegate: // content::DevToolsFrontendHostDelegate:
virtual void HandleMessageFromDevToolsFrontend(const std::string& message) override; void HandleMessageFromDevToolsFrontend(const std::string& message) override;
virtual void HandleMessageFromDevToolsFrontendToBackend(const std::string& message) override; void HandleMessageFromDevToolsFrontendToBackend(const std::string& message) override;
// content::WebContentsObserver: // content::WebContentsObserver:
virtual void AboutToNavigateRenderView(content::RenderViewHost* render_view_host) override; void AboutToNavigateRenderView(content::RenderViewHost* render_view_host) override;
virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host, void DidFinishLoad(content::RenderFrameHost* render_frame_host,
const GURL& validated_url) override; const GURL& validated_url) override;
virtual void WebContentsDestroyed() override; void WebContentsDestroyed() override;
// content::WebContentsDelegate // content::WebContentsDelegate
bool AddMessageToConsole(content::WebContents* source,
virtual bool AddMessageToConsole(content::WebContents* source,
int32 level, int32 level,
const base::string16& message, const base::string16& message,
int32 line_no, int32 line_no,
const base::string16& source_id) override; const base::string16& source_id) override;
virtual void HandleKeyboardEvent( void HandleKeyboardEvent(
content::WebContents*, const content::NativeWebKeyboardEvent&) override; content::WebContents*, const content::NativeWebKeyboardEvent&) override;
virtual void CloseContents(content::WebContents* source) override; void CloseContents(content::WebContents* source) override;
scoped_ptr<content::WebContents> web_contents_; scoped_ptr<content::WebContents> web_contents_;
scoped_ptr<content::WebContents> devtools_web_contents_; scoped_ptr<content::WebContents> devtools_web_contents_;