Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/browser/guest_view/web_view/web_view_guest.h

Issue 664933004: Standardize usage of virtual/override/final in extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/browser/guest_view/web_view/javascript_dialog_helper.h ('k') | extensions/browser/guest_view/web_view/web_view_permission_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/guest_view/web_view/web_view_guest.h
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h
index 9c22fb1239cb34884bea74d89a6d28aff3a37a91..645a4e706995fce57e95c512bddb417ec2821c27 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.h
+++ b/extensions/browser/guest_view/web_view/web_view_guest.h
@@ -84,94 +84,89 @@ class WebViewGuest : public GuestView<WebViewGuest>,
std::string* error);
// GuestViewBase implementation.
- virtual const char* GetAPINamespace() const override;
- virtual int GetTaskPrefix() const override;
- virtual void CreateWebContents(
- const std::string& embedder_extension_id,
- int embedder_render_process_id,
- const GURL& embedder_site_url,
- const base::DictionaryValue& create_params,
- const WebContentsCreatedCallback& callback) override;
- virtual void DidAttachToEmbedder() override;
- virtual void DidInitialize() override;
- virtual void DidStopLoading() override;
- virtual void EmbedderDestroyed() override;
- virtual void GuestDestroyed() override;
- virtual void GuestReady() override;
- virtual void GuestSizeChangedDueToAutoSize(
- const gfx::Size& old_size,
- const gfx::Size& new_size) override;
- virtual bool IsAutoSizeSupported() const override;
- virtual bool IsDragAndDropEnabled() const override;
- virtual void WillAttachToEmbedder() override;
- virtual void WillDestroy() override;
+ const char* GetAPINamespace() const override;
+ int GetTaskPrefix() const override;
+ void CreateWebContents(const std::string& embedder_extension_id,
+ int embedder_render_process_id,
+ const GURL& embedder_site_url,
+ const base::DictionaryValue& create_params,
+ const WebContentsCreatedCallback& callback) override;
+ void DidAttachToEmbedder() override;
+ void DidInitialize() override;
+ void DidStopLoading() override;
+ void EmbedderDestroyed() override;
+ void GuestDestroyed() override;
+ void GuestReady() override;
+ void GuestSizeChangedDueToAutoSize(const gfx::Size& old_size,
+ const gfx::Size& new_size) override;
+ bool IsAutoSizeSupported() const override;
+ bool IsDragAndDropEnabled() const override;
+ void WillAttachToEmbedder() override;
+ void WillDestroy() override;
// WebContentsDelegate implementation.
- virtual bool AddMessageToConsole(content::WebContents* source,
- int32 level,
- const base::string16& message,
- int32 line_no,
- const base::string16& source_id) override;
- virtual void LoadProgressChanged(content::WebContents* source,
- double progress) override;
- virtual void CloseContents(content::WebContents* source) override;
- virtual void FindReply(content::WebContents* source,
- int request_id,
- int number_of_matches,
- const gfx::Rect& selection_rect,
- int active_match_ordinal,
- bool final_update) override;
- virtual bool HandleContextMenu(
- const content::ContextMenuParams& params) override;
- virtual void HandleKeyboardEvent(
+ bool AddMessageToConsole(content::WebContents* source,
+ int32 level,
+ const base::string16& message,
+ int32 line_no,
+ const base::string16& source_id) override;
+ void LoadProgressChanged(content::WebContents* source,
+ double progress) override;
+ void CloseContents(content::WebContents* source) override;
+ void FindReply(content::WebContents* source,
+ int request_id,
+ int number_of_matches,
+ const gfx::Rect& selection_rect,
+ int active_match_ordinal,
+ bool final_update) override;
+ bool HandleContextMenu(const content::ContextMenuParams& params) override;
+ void HandleKeyboardEvent(
content::WebContents* source,
const content::NativeWebKeyboardEvent& event) override;
- virtual void RendererResponsive(content::WebContents* source) override;
- virtual void RendererUnresponsive(content::WebContents* source) override;
- virtual void RequestMediaAccessPermission(
+ void RendererResponsive(content::WebContents* source) override;
+ void RendererUnresponsive(content::WebContents* source) override;
+ void RequestMediaAccessPermission(
content::WebContents* source,
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback) override;
- virtual bool CheckMediaAccessPermission(
- content::WebContents* source,
- const GURL& security_origin,
- content::MediaStreamType type) override;
- virtual void CanDownload(content::RenderViewHost* render_view_host,
- const GURL& url,
- const std::string& request_method,
- const base::Callback<void(bool)>& callback) override;
- virtual content::JavaScriptDialogManager*
- GetJavaScriptDialogManager() override;
- virtual content::ColorChooser* OpenColorChooser(
+ bool CheckMediaAccessPermission(content::WebContents* source,
+ const GURL& security_origin,
+ content::MediaStreamType type) override;
+ void CanDownload(content::RenderViewHost* render_view_host,
+ const GURL& url,
+ const std::string& request_method,
+ const base::Callback<void(bool)>& callback) override;
+ content::JavaScriptDialogManager* GetJavaScriptDialogManager() override;
+ content::ColorChooser* OpenColorChooser(
content::WebContents* web_contents,
SkColor color,
const std::vector<content::ColorSuggestion>& suggestions) override;
- virtual void AddNewContents(content::WebContents* source,
- content::WebContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos,
- bool user_gesture,
- bool* was_blocked) override;
- virtual content::WebContents* OpenURLFromTab(
+ void AddNewContents(content::WebContents* source,
+ content::WebContents* new_contents,
+ WindowOpenDisposition disposition,
+ const gfx::Rect& initial_pos,
+ bool user_gesture,
+ bool* was_blocked) override;
+ content::WebContents* OpenURLFromTab(
content::WebContents* source,
const content::OpenURLParams& params) override;
- virtual void WebContentsCreated(content::WebContents* source_contents,
- int opener_render_frame_id,
- const base::string16& frame_name,
- const GURL& target_url,
- content::WebContents* new_contents) override;
+ void WebContentsCreated(content::WebContents* source_contents,
+ int opener_render_frame_id,
+ const base::string16& frame_name,
+ const GURL& target_url,
+ content::WebContents* new_contents) override;
// BrowserPluginGuestDelegate implementation.
- virtual content::WebContents* CreateNewGuestWindow(
+ content::WebContents* CreateNewGuestWindow(
const content::WebContents::CreateParams& create_params) override;
- virtual void RequestPointerLockPermission(
+ void RequestPointerLockPermission(
bool user_gesture,
bool last_unlocked_by_target,
const base::Callback<void(bool)>& callback) override;
// 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;
// Returns the current zoom factor.
double GetZoom();
@@ -244,7 +239,7 @@ class WebViewGuest : public GuestView<WebViewGuest>,
WebViewGuest(content::BrowserContext* browser_context,
int guest_instance_id);
- virtual ~WebViewGuest();
+ ~WebViewGuest() override;
void AttachWebViewHelpers(content::WebContents* contents);
@@ -253,27 +248,25 @@ class WebViewGuest : public GuestView<WebViewGuest>,
const std::string& user_input);
// WebContentsObserver implementation.
- virtual void DidCommitProvisionalLoadForFrame(
+ void DidCommitProvisionalLoadForFrame(
content::RenderFrameHost* render_frame_host,
const GURL& url,
ui::PageTransition transition_type) override;
- virtual void DidFailProvisionalLoad(
- content::RenderFrameHost* render_frame_host,
- const GURL& validated_url,
- int error_code,
- const base::string16& error_description) override;
- virtual void DidStartProvisionalLoadForFrame(
+ void DidFailProvisionalLoad(content::RenderFrameHost* render_frame_host,
+ const GURL& validated_url,
+ int error_code,
+ const base::string16& error_description) override;
+ void DidStartProvisionalLoadForFrame(
content::RenderFrameHost* render_frame_host,
const GURL& validated_url,
bool is_error_page,
bool is_iframe_srcdoc) override;
- virtual void DocumentLoadedInFrame(
- content::RenderFrameHost* render_frame_host) override;
- virtual bool OnMessageReceived(
- const IPC::Message& message,
+ void DocumentLoadedInFrame(
content::RenderFrameHost* render_frame_host) override;
- virtual void RenderProcessGone(base::TerminationStatus status) override;
- virtual void UserAgentOverrideSet(const std::string& user_agent) override;
+ bool OnMessageReceived(const IPC::Message& message,
+ content::RenderFrameHost* render_frame_host) override;
+ void RenderProcessGone(base::TerminationStatus status) override;
+ void UserAgentOverrideSet(const std::string& user_agent) override;
// Informs the embedder of a frame name change.
void ReportFrameNameChange(const std::string& name);
« no previous file with comments | « extensions/browser/guest_view/web_view/javascript_dialog_helper.h ('k') | extensions/browser/guest_view/web_view/web_view_permission_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698