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

Unified Diff: content/browser/frame_host/interstitial_page_impl.h

Issue 667943003: Standardize usage of virtual/override/final in content/browser/ (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
Index: content/browser/frame_host/interstitial_page_impl.h
diff --git a/content/browser/frame_host/interstitial_page_impl.h b/content/browser/frame_host/interstitial_page_impl.h
index 35cd2d5a7aa5e1e7d54e7e01df87016d83a191d9..b1dd303ce8db557c5af3501019e8d8bbfbbabb4c 100644
--- a/content/browser/frame_host/interstitial_page_impl.h
+++ b/content/browser/frame_host/interstitial_page_impl.h
@@ -55,18 +55,18 @@ class CONTENT_EXPORT InterstitialPageImpl
bool new_navigation,
const GURL& url,
InterstitialPageDelegate* delegate);
- virtual ~InterstitialPageImpl();
+ ~InterstitialPageImpl() override;
// InterstitialPage implementation:
- virtual void Show() override;
- virtual void Hide() override;
- virtual void DontProceed() override;
- virtual void Proceed() override;
- virtual RenderViewHost* GetRenderViewHostForTesting() const override;
- virtual InterstitialPageDelegate* GetDelegateForTesting() override;
- virtual void DontCreateViewForTesting() override;
- virtual void SetSize(const gfx::Size& size) override;
- virtual void Focus() override;
+ void Show() override;
+ void Hide() override;
+ void DontProceed() override;
+ void Proceed() override;
+ RenderViewHost* GetRenderViewHostForTesting() const override;
+ InterstitialPageDelegate* GetDelegateForTesting() override;
+ void DontCreateViewForTesting() override;
+ void SetSize(const gfx::Size& size) override;
+ void Focus() override;
// Allows the user to navigate away by disabling the interstitial, canceling
// the pending request, and unblocking the hidden renderer. The interstitial
@@ -99,72 +99,67 @@ class CONTENT_EXPORT InterstitialPageImpl
protected:
// NotificationObserver method:
- virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) override;
+ void Observe(int type,
+ const NotificationSource& source,
+ const NotificationDetails& details) override;
// WebContentsObserver implementation:
- virtual bool OnMessageReceived(const IPC::Message& message,
- RenderFrameHost* render_frame_host) override;
- virtual bool OnMessageReceived(const IPC::Message& message) override;
- virtual void WebContentsDestroyed() override;
- virtual void NavigationEntryCommitted(
+ bool OnMessageReceived(const IPC::Message& message,
+ RenderFrameHost* render_frame_host) override;
+ bool OnMessageReceived(const IPC::Message& message) override;
+ void WebContentsDestroyed() override;
+ void NavigationEntryCommitted(
const LoadCommittedDetails& load_details) override;
// RenderFrameHostDelegate implementation:
- virtual bool OnMessageReceived(RenderFrameHost* render_frame_host,
- const IPC::Message& message) override;
- virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
- virtual void UpdateTitle(RenderFrameHost* render_frame_host,
- int32 page_id,
- const base::string16& title,
- base::i18n::TextDirection title_direction) override;
- virtual AccessibilityMode GetAccessibilityMode() const override;
+ bool OnMessageReceived(RenderFrameHost* render_frame_host,
+ const IPC::Message& message) override;
+ void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
+ void UpdateTitle(RenderFrameHost* render_frame_host,
+ int32 page_id,
+ const base::string16& title,
+ base::i18n::TextDirection title_direction) override;
+ AccessibilityMode GetAccessibilityMode() const override;
// RenderViewHostDelegate implementation:
- virtual RenderViewHostDelegateView* GetDelegateView() override;
- virtual bool OnMessageReceived(RenderViewHost* render_view_host,
- const IPC::Message& message) override;
- virtual const GURL& GetMainFrameLastCommittedURL() const override;
- virtual void RenderViewTerminated(RenderViewHost* render_view_host,
- base::TerminationStatus status,
- int error_code) override;
- virtual RendererPreferences GetRendererPrefs(
+ RenderViewHostDelegateView* GetDelegateView() override;
+ bool OnMessageReceived(RenderViewHost* render_view_host,
+ const IPC::Message& message) override;
+ const GURL& GetMainFrameLastCommittedURL() const override;
+ void RenderViewTerminated(RenderViewHost* render_view_host,
+ base::TerminationStatus status,
+ int error_code) override;
+ RendererPreferences GetRendererPrefs(
BrowserContext* browser_context) const override;
- virtual WebPreferences ComputeWebkitPrefs() override;
- virtual gfx::Rect GetRootWindowResizerRect() const override;
- virtual void CreateNewWindow(
+ WebPreferences ComputeWebkitPrefs() override;
+ gfx::Rect GetRootWindowResizerRect() const override;
+ void CreateNewWindow(
int render_process_id,
int route_id,
int main_frame_route_id,
const ViewHostMsg_CreateWindow_Params& params,
SessionStorageNamespace* session_storage_namespace) override;
- virtual void CreateNewWidget(int render_process_id,
- int route_id,
- blink::WebPopupType popup_type) override;
- virtual void CreateNewFullscreenWidget(int render_process_id,
- int route_id) override;
- virtual void ShowCreatedWindow(int route_id,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_pos,
- bool user_gesture) override;
- virtual void ShowCreatedWidget(int route_id,
- const gfx::Rect& initial_pos) override;
- virtual void ShowCreatedFullscreenWidget(int route_id) override;
-
- virtual SessionStorageNamespace* GetSessionStorageNamespace(
+ void CreateNewWidget(int render_process_id,
+ int route_id,
+ blink::WebPopupType popup_type) override;
+ void CreateNewFullscreenWidget(int render_process_id, int route_id) override;
+ void ShowCreatedWindow(int route_id,
+ WindowOpenDisposition disposition,
+ const gfx::Rect& initial_pos,
+ bool user_gesture) override;
+ void ShowCreatedWidget(int route_id, const gfx::Rect& initial_pos) override;
+ void ShowCreatedFullscreenWidget(int route_id) override;
+
+ SessionStorageNamespace* GetSessionStorageNamespace(
SiteInstance* instance) override;
- virtual FrameTree* GetFrameTree() override;
+ FrameTree* GetFrameTree() override;
// RenderWidgetHostDelegate implementation:
- virtual void RenderWidgetDeleted(
- RenderWidgetHostImpl* render_widget_host) override;
- virtual bool PreHandleKeyboardEvent(
- const NativeWebKeyboardEvent& event,
- bool* is_keyboard_shortcut) override;
- virtual void HandleKeyboardEvent(
- const NativeWebKeyboardEvent& event) override;
+ void RenderWidgetDeleted(RenderWidgetHostImpl* render_widget_host) override;
+ bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
+ bool* is_keyboard_shortcut) override;
+ void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override;
#if defined(OS_WIN)
virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() override;
#endif
« no previous file with comments | « content/browser/frame_host/frame_tree_unittest.cc ('k') | content/browser/frame_host/interstitial_page_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698