diff options
Diffstat (limited to 'content/browser/frame_host')
21 files changed, 445 insertions, 477 deletions
diff --git a/content/browser/frame_host/frame_tree_browsertest.cc b/content/browser/frame_host/frame_tree_browsertest.cc index 6e953e4..9f16066 100644 --- a/content/browser/frame_host/frame_tree_browsertest.cc +++ b/content/browser/frame_host/frame_tree_browsertest.cc @@ -203,7 +203,7 @@ class CrossProcessFrameTreeBrowserTest : public ContentBrowserTest { public: CrossProcessFrameTreeBrowserTest() {} - virtual void SetUpCommandLine(base::CommandLine* command_line) override { + void SetUpCommandLine(base::CommandLine* command_line) override { command_line->AppendSwitch(switches::kSitePerProcess); } diff --git a/content/browser/frame_host/frame_tree_unittest.cc b/content/browser/frame_host/frame_tree_unittest.cc index b4d41b2..bb705c7 100644 --- a/content/browser/frame_host/frame_tree_unittest.cc +++ b/content/browser/frame_host/frame_tree_unittest.cc @@ -51,7 +51,7 @@ class TreeWalkingWebContentsLogger : public WebContentsObserver { explicit TreeWalkingWebContentsLogger(WebContents* web_contents) : WebContentsObserver(web_contents) {} - virtual ~TreeWalkingWebContentsLogger() { + ~TreeWalkingWebContentsLogger() override { EXPECT_EQ("", log_) << "Activity logged that was not expected"; } @@ -63,22 +63,22 @@ class TreeWalkingWebContentsLogger : public WebContentsObserver { } // content::WebContentsObserver implementation. - virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override { + void RenderFrameCreated(RenderFrameHost* render_frame_host) override { LogWhatHappened("RenderFrameCreated", render_frame_host); } - virtual void RenderFrameHostChanged(RenderFrameHost* old_host, - RenderFrameHost* new_host) override { + void RenderFrameHostChanged(RenderFrameHost* old_host, + RenderFrameHost* new_host) override { if (old_host) LogWhatHappened("RenderFrameChanged(old)", old_host); LogWhatHappened("RenderFrameChanged(new)", new_host); } - virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override { + void RenderFrameDeleted(RenderFrameHost* render_frame_host) override { LogWhatHappened("RenderFrameDeleted", render_frame_host); } - virtual void RenderProcessGone(base::TerminationStatus status) override { + void RenderProcessGone(base::TerminationStatus status) override { LogWhatHappened("RenderProcessGone"); } diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc index 6899d42..a588132 100644 --- a/content/browser/frame_host/interstitial_page_impl.cc +++ b/content/browser/frame_host/interstitial_page_impl.cc @@ -78,24 +78,24 @@ class InterstitialPageImpl::InterstitialPageRVHDelegateView // RenderViewHostDelegateView implementation: #if defined(OS_MACOSX) || defined(OS_ANDROID) - virtual void ShowPopupMenu(RenderFrameHost* render_frame_host, - const gfx::Rect& bounds, - int item_height, - double item_font_size, - int selected_item, - const std::vector<MenuItem>& items, - bool right_aligned, - bool allow_multiple_selection) override; - virtual void HidePopupMenu() override; + void ShowPopupMenu(RenderFrameHost* render_frame_host, + const gfx::Rect& bounds, + int item_height, + double item_font_size, + int selected_item, + const std::vector<MenuItem>& items, + bool right_aligned, + bool allow_multiple_selection) override; + void HidePopupMenu() override; #endif - virtual void StartDragging(const DropData& drop_data, - WebDragOperationsMask operations_allowed, - const gfx::ImageSkia& image, - const gfx::Vector2d& image_offset, - const DragEventSourceInfo& event_info) override; - virtual void UpdateDragCursor(WebDragOperation operation) override; - virtual void GotFocus() override; - virtual void TakeFocus(bool reverse) override; + void StartDragging(const DropData& drop_data, + WebDragOperationsMask operations_allowed, + const gfx::ImageSkia& image, + const gfx::Vector2d& image_offset, + const DragEventSourceInfo& event_info) override; + void UpdateDragCursor(WebDragOperation operation) override; + void GotFocus() override; + void TakeFocus(bool reverse) override; virtual void OnFindReply(int request_id, int number_of_matches, const gfx::Rect& selection_rect, diff --git a/content/browser/frame_host/interstitial_page_impl.h b/content/browser/frame_host/interstitial_page_impl.h index 35cd2d5..b1dd303 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 diff --git a/content/browser/frame_host/interstitial_page_navigator_impl.h b/content/browser/frame_host/interstitial_page_navigator_impl.h index bc06494..2f96614 100644 --- a/content/browser/frame_host/interstitial_page_navigator_impl.h +++ b/content/browser/frame_host/interstitial_page_navigator_impl.h @@ -22,14 +22,13 @@ class CONTENT_EXPORT InterstitialPageNavigatorImpl : public Navigator { InterstitialPageImpl* interstitial, NavigationControllerImpl* navigation_controller); - virtual NavigationController* GetController() override; - virtual void DidNavigate( - RenderFrameHostImpl* render_frame_host, - const FrameHostMsg_DidCommitProvisionalLoad_Params& - input_params) override; + NavigationController* GetController() override; + void DidNavigate(RenderFrameHostImpl* render_frame_host, + const FrameHostMsg_DidCommitProvisionalLoad_Params& + input_params) override; private: - virtual ~InterstitialPageNavigatorImpl() {} + ~InterstitialPageNavigatorImpl() override {} // The InterstitialPage with which this navigator object is associated. // Non owned pointer. diff --git a/content/browser/frame_host/navigation_controller_impl.h b/content/browser/frame_host/navigation_controller_impl.h index 8a730da..a646646 100644 --- a/content/browser/frame_host/navigation_controller_impl.h +++ b/content/browser/frame_host/navigation_controller_impl.h @@ -31,68 +31,63 @@ class CONTENT_EXPORT NavigationControllerImpl NavigationControllerImpl( NavigationControllerDelegate* delegate, BrowserContext* browser_context); - virtual ~NavigationControllerImpl(); + ~NavigationControllerImpl() override; // NavigationController implementation: - virtual WebContents* GetWebContents() const override; - virtual BrowserContext* GetBrowserContext() const override; - virtual void SetBrowserContext( - BrowserContext* browser_context) override; - virtual void Restore( - int selected_navigation, - RestoreType type, - std::vector<NavigationEntry*>* entries) override; - virtual NavigationEntry* GetActiveEntry() const override; - virtual NavigationEntry* GetVisibleEntry() const override; - virtual int GetCurrentEntryIndex() const override; - virtual NavigationEntry* GetLastCommittedEntry() const override; - virtual int GetLastCommittedEntryIndex() const override; - virtual bool CanViewSource() const override; - virtual int GetEntryCount() const override; - virtual NavigationEntry* GetEntryAtIndex(int index) const override; - virtual NavigationEntry* GetEntryAtOffset(int offset) const override; - virtual void DiscardNonCommittedEntries() override; - virtual NavigationEntry* GetPendingEntry() const override; - virtual int GetPendingEntryIndex() const override; - virtual NavigationEntry* GetTransientEntry() const override; - virtual void SetTransientEntry(NavigationEntry* entry) override; - virtual void LoadURL(const GURL& url, - const Referrer& referrer, - ui::PageTransition type, - const std::string& extra_headers) override; - virtual void LoadURLWithParams(const LoadURLParams& params) override; - virtual void LoadIfNecessary() override; - virtual bool CanGoBack() const override; - virtual bool CanGoForward() const override; - virtual bool CanGoToOffset(int offset) const override; - virtual void GoBack() override; - virtual void GoForward() override; - virtual void GoToIndex(int index) override; - virtual void GoToOffset(int offset) override; - virtual bool RemoveEntryAtIndex(int index) override; - virtual const SessionStorageNamespaceMap& - GetSessionStorageNamespaceMap() const override; - virtual SessionStorageNamespace* - GetDefaultSessionStorageNamespace() override; - virtual void SetMaxRestoredPageID(int32 max_id) override; - virtual int32 GetMaxRestoredPageID() const override; - virtual bool NeedsReload() const override; - virtual void SetNeedsReload() override; - virtual void CancelPendingReload() override; - virtual void ContinuePendingReload() override; - virtual bool IsInitialNavigation() const override; - virtual void Reload(bool check_for_repost) override; - virtual void ReloadIgnoringCache(bool check_for_repost) override; - virtual void ReloadOriginalRequestURL(bool check_for_repost) override; - virtual void NotifyEntryChanged(const NavigationEntry* entry, - int index) override; - virtual void CopyStateFrom( - const NavigationController& source) override; - virtual void CopyStateFromAndPrune(NavigationController* source, - bool replace_entry) override; - virtual bool CanPruneAllButLastCommitted() override; - virtual void PruneAllButLastCommitted() override; - virtual void ClearAllScreenshots() override; + WebContents* GetWebContents() const override; + BrowserContext* GetBrowserContext() const override; + void SetBrowserContext(BrowserContext* browser_context) override; + void Restore(int selected_navigation, + RestoreType type, + std::vector<NavigationEntry*>* entries) override; + NavigationEntry* GetActiveEntry() const override; + NavigationEntry* GetVisibleEntry() const override; + int GetCurrentEntryIndex() const override; + NavigationEntry* GetLastCommittedEntry() const override; + int GetLastCommittedEntryIndex() const override; + bool CanViewSource() const override; + int GetEntryCount() const override; + NavigationEntry* GetEntryAtIndex(int index) const override; + NavigationEntry* GetEntryAtOffset(int offset) const override; + void DiscardNonCommittedEntries() override; + NavigationEntry* GetPendingEntry() const override; + int GetPendingEntryIndex() const override; + NavigationEntry* GetTransientEntry() const override; + void SetTransientEntry(NavigationEntry* entry) override; + void LoadURL(const GURL& url, + const Referrer& referrer, + ui::PageTransition type, + const std::string& extra_headers) override; + void LoadURLWithParams(const LoadURLParams& params) override; + void LoadIfNecessary() override; + bool CanGoBack() const override; + bool CanGoForward() const override; + bool CanGoToOffset(int offset) const override; + void GoBack() override; + void GoForward() override; + void GoToIndex(int index) override; + void GoToOffset(int offset) override; + bool RemoveEntryAtIndex(int index) override; + const SessionStorageNamespaceMap& GetSessionStorageNamespaceMap() + const override; + SessionStorageNamespace* GetDefaultSessionStorageNamespace() override; + void SetMaxRestoredPageID(int32 max_id) override; + int32 GetMaxRestoredPageID() const override; + bool NeedsReload() const override; + void SetNeedsReload() override; + void CancelPendingReload() override; + void ContinuePendingReload() override; + bool IsInitialNavigation() const override; + void Reload(bool check_for_repost) override; + void ReloadIgnoringCache(bool check_for_repost) override; + void ReloadOriginalRequestURL(bool check_for_repost) override; + void NotifyEntryChanged(const NavigationEntry* entry, int index) override; + void CopyStateFrom(const NavigationController& source) override; + void CopyStateFromAndPrune(NavigationController* source, + bool replace_entry) override; + bool CanPruneAllButLastCommitted() override; + void PruneAllButLastCommitted() override; + void ClearAllScreenshots() override; // Whether this is the initial navigation in an unmodified new tab. In this // case, we know there is no content displayed in the page. diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc index 621ab24..a1d14ca 100644 --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc @@ -74,8 +74,7 @@ class MockScreenshotManager : public content::NavigationEntryScreenshotManager { encoding_screenshot_in_progress_(false) { } - virtual ~MockScreenshotManager() { - } + ~MockScreenshotManager() override {} void TakeScreenshotFor(content::NavigationEntryImpl* entry) { SkBitmap bitmap; @@ -100,12 +99,10 @@ class MockScreenshotManager : public content::NavigationEntryScreenshotManager { private: // Overridden from content::NavigationEntryScreenshotManager: - virtual void TakeScreenshotImpl( - content::RenderViewHost* host, - content::NavigationEntryImpl* entry) override { - } + void TakeScreenshotImpl(content::RenderViewHost* host, + content::NavigationEntryImpl* entry) override {} - virtual void OnScreenshotSet(content::NavigationEntryImpl* entry) override { + void OnScreenshotSet(content::NavigationEntryImpl* entry) override { encoding_screenshot_in_progress_ = false; NavigationEntryScreenshotManager::OnScreenshotSet(entry); if (message_loop_runner_.get()) @@ -196,13 +193,13 @@ class NavigationControllerTest } // WebContentsObserver: - virtual void DidStartNavigationToPendingEntry( + void DidStartNavigationToPendingEntry( const GURL& url, NavigationController::ReloadType reload_type) override { navigated_url_ = url; } - virtual void NavigationEntryCommitted( + void NavigationEntryCommitted( const LoadCommittedDetails& load_details) override { navigation_entry_committed_counter_++; } @@ -247,12 +244,12 @@ class TestWebContentsDelegate : public WebContentsDelegate { } // Keep track of whether the tab has notified us of a navigation state change. - virtual void NavigationStateChanged(const WebContents* source, - InvalidateTypes changed_flags) override { + void NavigationStateChanged(const WebContents* source, + InvalidateTypes changed_flags) override { navigation_state_change_count_++; } - virtual void ShowRepostFormWarningDialog(WebContents* source) override { + void ShowRepostFormWarningDialog(WebContents* source) override { repost_form_warning_count_++; } @@ -2292,9 +2289,9 @@ class PrunedListener : public NotificationObserver { Source<NavigationController>(controller)); } - virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) override { + void Observe(int type, + const NotificationSource& source, + const NotificationDetails& details) override { if (type == NOTIFICATION_NAV_LIST_PRUNED) { notification_count_++; details_ = *(Details<PrunedDetails>(details).ptr()); diff --git a/content/browser/frame_host/navigation_entry_impl.h b/content/browser/frame_host/navigation_entry_impl.h index 4e38954..37de182 100644 --- a/content/browser/frame_host/navigation_entry_impl.h +++ b/content/browser/frame_host/navigation_entry_impl.h @@ -32,63 +32,61 @@ class CONTENT_EXPORT NavigationEntryImpl const base::string16& title, ui::PageTransition transition_type, bool is_renderer_initiated); - virtual ~NavigationEntryImpl(); + ~NavigationEntryImpl() override; // NavigationEntry implementation: - virtual int GetUniqueID() const override; - virtual PageType GetPageType() const override; - virtual void SetURL(const GURL& url) override; - virtual const GURL& GetURL() const override; - virtual void SetBaseURLForDataURL(const GURL& url) override; - virtual const GURL& GetBaseURLForDataURL() const override; - virtual void SetReferrer(const Referrer& referrer) override; - virtual const Referrer& GetReferrer() const override; - virtual void SetVirtualURL(const GURL& url) override; - virtual const GURL& GetVirtualURL() const override; - virtual void SetTitle(const base::string16& title) override; - virtual const base::string16& GetTitle() const override; - virtual void SetPageState(const PageState& state) override; - virtual const PageState& GetPageState() const override; - virtual void SetPageID(int page_id) override; - virtual int32 GetPageID() const override; - virtual const base::string16& GetTitleForDisplay( + int GetUniqueID() const override; + PageType GetPageType() const override; + void SetURL(const GURL& url) override; + const GURL& GetURL() const override; + void SetBaseURLForDataURL(const GURL& url) override; + const GURL& GetBaseURLForDataURL() const override; + void SetReferrer(const Referrer& referrer) override; + const Referrer& GetReferrer() const override; + void SetVirtualURL(const GURL& url) override; + const GURL& GetVirtualURL() const override; + void SetTitle(const base::string16& title) override; + const base::string16& GetTitle() const override; + void SetPageState(const PageState& state) override; + const PageState& GetPageState() const override; + void SetPageID(int page_id) override; + int32 GetPageID() const override; + const base::string16& GetTitleForDisplay( const std::string& languages) const override; - virtual bool IsViewSourceMode() const override; - virtual void SetTransitionType(ui::PageTransition transition_type) override; - virtual ui::PageTransition GetTransitionType() const override; - virtual const GURL& GetUserTypedURL() const override; - virtual void SetHasPostData(bool has_post_data) override; - virtual bool GetHasPostData() const override; - virtual void SetPostID(int64 post_id) override; - virtual int64 GetPostID() const override; - virtual void SetBrowserInitiatedPostData( - const base::RefCountedMemory* data) override; - virtual const base::RefCountedMemory* - GetBrowserInitiatedPostData() const override; - virtual const FaviconStatus& GetFavicon() const override; - virtual FaviconStatus& GetFavicon() override; - virtual const SSLStatus& GetSSL() const override; - virtual SSLStatus& GetSSL() override; - virtual void SetOriginalRequestURL(const GURL& original_url) override; - virtual const GURL& GetOriginalRequestURL() const override; - virtual void SetIsOverridingUserAgent(bool override) override; - virtual bool GetIsOverridingUserAgent() const override; - virtual void SetTimestamp(base::Time timestamp) override; - virtual base::Time GetTimestamp() const override; - virtual void SetCanLoadLocalResources(bool allow) override; - virtual bool GetCanLoadLocalResources() const override; - virtual void SetFrameToNavigate(const std::string& frame_name) override; - virtual const std::string& GetFrameToNavigate() const override; - virtual void SetExtraData(const std::string& key, - const base::string16& data) override; - virtual bool GetExtraData(const std::string& key, - base::string16* data) const override; - virtual void ClearExtraData(const std::string& key) override; - virtual void SetHttpStatusCode(int http_status_code) override; - virtual int GetHttpStatusCode() const override; - virtual void SetRedirectChain(const std::vector<GURL>& redirects) override; - virtual const std::vector<GURL>& GetRedirectChain() const override; - virtual bool IsRestored() const override; + bool IsViewSourceMode() const override; + void SetTransitionType(ui::PageTransition transition_type) override; + ui::PageTransition GetTransitionType() const override; + const GURL& GetUserTypedURL() const override; + void SetHasPostData(bool has_post_data) override; + bool GetHasPostData() const override; + void SetPostID(int64 post_id) override; + int64 GetPostID() const override; + void SetBrowserInitiatedPostData(const base::RefCountedMemory* data) override; + const base::RefCountedMemory* GetBrowserInitiatedPostData() const override; + const FaviconStatus& GetFavicon() const override; + FaviconStatus& GetFavicon() override; + const SSLStatus& GetSSL() const override; + SSLStatus& GetSSL() override; + void SetOriginalRequestURL(const GURL& original_url) override; + const GURL& GetOriginalRequestURL() const override; + void SetIsOverridingUserAgent(bool override) override; + bool GetIsOverridingUserAgent() const override; + void SetTimestamp(base::Time timestamp) override; + base::Time GetTimestamp() const override; + void SetCanLoadLocalResources(bool allow) override; + bool GetCanLoadLocalResources() const override; + void SetFrameToNavigate(const std::string& frame_name) override; + const std::string& GetFrameToNavigate() const override; + void SetExtraData(const std::string& key, + const base::string16& data) override; + bool GetExtraData(const std::string& key, + base::string16* data) const override; + void ClearExtraData(const std::string& key) override; + void SetHttpStatusCode(int http_status_code) override; + int GetHttpStatusCode() const override; + void SetRedirectChain(const std::vector<GURL>& redirects) override; + const std::vector<GURL>& GetRedirectChain() const override; + bool IsRestored() const override; // Once a navigation entry is committed, we should no longer track several // pieces of non-persisted state, as documented on the members below. diff --git a/content/browser/frame_host/navigator_impl.h b/content/browser/frame_host/navigator_impl.h index e0cac3e..e142b3f 100644 --- a/content/browser/frame_host/navigator_impl.h +++ b/content/browser/frame_host/navigator_impl.h @@ -36,62 +36,58 @@ class CONTENT_EXPORT NavigatorImpl : public Navigator { NavigatorDelegate* delegate); // Navigator implementation. - virtual NavigationController* GetController() override; - virtual void DidStartProvisionalLoad(RenderFrameHostImpl* render_frame_host, - const GURL& url, - bool is_transition_navigation) override; - virtual void DidFailProvisionalLoadWithError( + NavigationController* GetController() override; + void DidStartProvisionalLoad(RenderFrameHostImpl* render_frame_host, + const GURL& url, + bool is_transition_navigation) override; + void DidFailProvisionalLoadWithError( RenderFrameHostImpl* render_frame_host, const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) override; - virtual void DidFailLoadWithError( - RenderFrameHostImpl* render_frame_host, - const GURL& url, - int error_code, - const base::string16& error_description) override; - virtual void DidNavigate( - RenderFrameHostImpl* render_frame_host, - const FrameHostMsg_DidCommitProvisionalLoad_Params& - input_params) override; - virtual bool NavigateToPendingEntry( + void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host, + const GURL& url, + int error_code, + const base::string16& error_description) override; + void DidNavigate(RenderFrameHostImpl* render_frame_host, + const FrameHostMsg_DidCommitProvisionalLoad_Params& + input_params) override; + bool NavigateToPendingEntry( RenderFrameHostImpl* render_frame_host, NavigationController::ReloadType reload_type) override; - virtual void RequestOpenURL(RenderFrameHostImpl* render_frame_host, - const GURL& url, - const Referrer& referrer, - WindowOpenDisposition disposition, - bool should_replace_current_entry, - bool user_gesture) override; - virtual void RequestTransferURL( - RenderFrameHostImpl* render_frame_host, - const GURL& url, - const std::vector<GURL>& redirect_chain, - const Referrer& referrer, - ui::PageTransition page_transition, - WindowOpenDisposition disposition, - const GlobalRequestID& transferred_global_request_id, - bool should_replace_current_entry, - bool user_gesture) override; - virtual void OnBeginNavigation( - FrameTreeNode* frame_tree_node, - const FrameHostMsg_BeginNavigation_Params& params, - const CommonNavigationParams& common_params) override; - virtual void CommitNavigation(FrameTreeNode* frame_tree_node, - ResourceResponse* response, - scoped_ptr<StreamHandle> body) override; - virtual void LogResourceRequestTime( - base::TimeTicks timestamp, const GURL& url) override; - virtual void LogBeforeUnloadTime( + void RequestOpenURL(RenderFrameHostImpl* render_frame_host, + const GURL& url, + const Referrer& referrer, + WindowOpenDisposition disposition, + bool should_replace_current_entry, + bool user_gesture) override; + void RequestTransferURL(RenderFrameHostImpl* render_frame_host, + const GURL& url, + const std::vector<GURL>& redirect_chain, + const Referrer& referrer, + ui::PageTransition page_transition, + WindowOpenDisposition disposition, + const GlobalRequestID& transferred_global_request_id, + bool should_replace_current_entry, + bool user_gesture) override; + void OnBeginNavigation(FrameTreeNode* frame_tree_node, + const FrameHostMsg_BeginNavigation_Params& params, + const CommonNavigationParams& common_params) override; + void CommitNavigation(FrameTreeNode* frame_tree_node, + ResourceResponse* response, + scoped_ptr<StreamHandle> body) override; + void LogResourceRequestTime(base::TimeTicks timestamp, + const GURL& url) override; + void LogBeforeUnloadTime( const base::TimeTicks& renderer_before_unload_start_time, const base::TimeTicks& renderer_before_unload_end_time) override; - virtual void CancelNavigation(FrameTreeNode* frame_tree_node) override; + void CancelNavigation(FrameTreeNode* frame_tree_node) override; private: // Holds data used to track browser side navigation metrics. struct NavigationMetricsData; friend class NavigatorTest; - virtual ~NavigatorImpl(); + ~NavigatorImpl() override; // Navigates to the given entry, which must be the pending entry. Private // because all callers should use NavigateToPendingEntry. diff --git a/content/browser/frame_host/popup_menu_helper_mac.h b/content/browser/frame_host/popup_menu_helper_mac.h index 70000d6..e92aa10 100644 --- a/content/browser/frame_host/popup_menu_helper_mac.h +++ b/content/browser/frame_host/popup_menu_helper_mac.h @@ -50,9 +50,9 @@ class PopupMenuHelper : public NotificationObserver { virtual RenderWidgetHostViewMac* GetRenderWidgetHostView() const; // NotificationObserver implementation: - virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) override; + void Observe(int type, + const NotificationSource& source, + const NotificationDetails& details) override; NotificationRegistrar notification_registrar_; RenderFrameHostImpl* render_frame_host_; diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc index e4f174e..bd837fa 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc @@ -85,9 +85,9 @@ class DesktopNotificationDelegateImpl : public DesktopNotificationDelegate { render_frame_id_(render_frame_host->GetRoutingID()), notification_id_(notification_id) {} - virtual ~DesktopNotificationDelegateImpl() {} + ~DesktopNotificationDelegateImpl() override {} - virtual void NotificationDisplayed() override { + void NotificationDisplayed() override { RenderFrameHost* rfh = RenderFrameHost::FromID(render_process_id_, render_frame_id_); if (!rfh) @@ -97,7 +97,7 @@ class DesktopNotificationDelegateImpl : public DesktopNotificationDelegate { rfh->GetRoutingID(), notification_id_)); } - virtual void NotificationError() override { + void NotificationError() override { RenderFrameHost* rfh = RenderFrameHost::FromID(render_process_id_, render_frame_id_); if (!rfh) @@ -107,7 +107,7 @@ class DesktopNotificationDelegateImpl : public DesktopNotificationDelegate { rfh->GetRoutingID(), notification_id_)); } - virtual void NotificationClosed(bool by_user) override { + void NotificationClosed(bool by_user) override { RenderFrameHost* rfh = RenderFrameHost::FromID(render_process_id_, render_frame_id_); if (!rfh) @@ -119,7 +119,7 @@ class DesktopNotificationDelegateImpl : public DesktopNotificationDelegate { notification_id_); } - virtual void NotificationClick() override { + void NotificationClick() override { RenderFrameHost* rfh = RenderFrameHost::FromID(render_process_id_, render_frame_id_); if (!rfh) diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h index 0dd9bff..3fcb8e2 100644 --- a/content/browser/frame_host/render_frame_host_impl.h +++ b/content/browser/frame_host/render_frame_host_impl.h @@ -95,55 +95,52 @@ class CONTENT_EXPORT RenderFrameHostImpl static RenderFrameHostImpl* FromID(int process_id, int routing_id); - virtual ~RenderFrameHostImpl(); + ~RenderFrameHostImpl() override; // RenderFrameHost - virtual int GetRoutingID() override; - virtual SiteInstanceImpl* GetSiteInstance() override; - virtual RenderProcessHost* GetProcess() override; - virtual RenderFrameHost* GetParent() override; - virtual const std::string& GetFrameName() override; - virtual bool IsCrossProcessSubframe() override; - virtual GURL GetLastCommittedURL() override; - virtual gfx::NativeView GetNativeView() override; - virtual void ExecuteJavaScript( - const base::string16& javascript) override; - virtual void ExecuteJavaScript( - const base::string16& javascript, - const JavaScriptResultCallback& callback) override; - virtual void ExecuteJavaScriptForTests( - const base::string16& javascript) override; - virtual RenderViewHost* GetRenderViewHost() override; - virtual ServiceRegistry* GetServiceRegistry() override; + int GetRoutingID() override; + SiteInstanceImpl* GetSiteInstance() override; + RenderProcessHost* GetProcess() override; + RenderFrameHost* GetParent() override; + const std::string& GetFrameName() override; + bool IsCrossProcessSubframe() override; + GURL GetLastCommittedURL() override; + gfx::NativeView GetNativeView() override; + void ExecuteJavaScript(const base::string16& javascript) override; + void ExecuteJavaScript(const base::string16& javascript, + const JavaScriptResultCallback& callback) override; + void ExecuteJavaScriptForTests(const base::string16& javascript) override; + RenderViewHost* GetRenderViewHost() override; + ServiceRegistry* GetServiceRegistry() override; // IPC::Sender - virtual bool Send(IPC::Message* msg) override; + bool Send(IPC::Message* msg) override; // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; // BrowserAccessibilityDelegate - virtual void AccessibilitySetFocus(int acc_obj_id) override; - virtual void AccessibilityDoDefaultAction(int acc_obj_id) override; - virtual void AccessibilityShowMenu(const gfx::Point& global_point) override; - virtual void AccessibilityScrollToMakeVisible( - int acc_obj_id, const gfx::Rect& subfocus) override; - virtual void AccessibilityScrollToPoint( - int acc_obj_id, const gfx::Point& point) override; - virtual void AccessibilitySetTextSelection( - int acc_obj_id, int start_offset, int end_offset) override; - virtual bool AccessibilityViewHasFocus() const override; - virtual gfx::Rect AccessibilityGetViewBounds() const override; - virtual gfx::Point AccessibilityOriginInScreen(const gfx::Rect& bounds) - const override; - virtual void AccessibilityHitTest(const gfx::Point& point) override; - virtual void AccessibilityFatalError() override; - virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; - virtual gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() - override; - virtual BrowserAccessibilityManager* AccessibilityGetChildFrame( + void AccessibilitySetFocus(int acc_obj_id) override; + void AccessibilityDoDefaultAction(int acc_obj_id) override; + void AccessibilityShowMenu(const gfx::Point& global_point) override; + void AccessibilityScrollToMakeVisible(int acc_obj_id, + const gfx::Rect& subfocus) override; + void AccessibilityScrollToPoint(int acc_obj_id, + const gfx::Point& point) override; + void AccessibilitySetTextSelection(int acc_obj_id, + int start_offset, + int end_offset) override; + bool AccessibilityViewHasFocus() const override; + gfx::Rect AccessibilityGetViewBounds() const override; + gfx::Point AccessibilityOriginInScreen( + const gfx::Rect& bounds) const override; + void AccessibilityHitTest(const gfx::Point& point) override; + void AccessibilityFatalError() override; + gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; + gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; + BrowserAccessibilityManager* AccessibilityGetChildFrame( int accessibility_node_id) override; - virtual BrowserAccessibility* AccessibilityGetParentFrame() override; + BrowserAccessibility* AccessibilityGetParentFrame() override; // Creates a RenderFrame in the renderer process. Only called for // cross-process subframe navigations in --site-per-process. diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h index a9d5f44..ff9d769 100644 --- a/content/browser/frame_host/render_frame_host_manager.h +++ b/content/browser/frame_host/render_frame_host_manager.h @@ -187,7 +187,7 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { RenderViewHostDelegate* render_view_delegate, RenderWidgetHostDelegate* render_widget_delegate, Delegate* delegate); - virtual ~RenderFrameHostManager(); + ~RenderFrameHostManager() override; // For arguments, see WebContentsImpl constructor. void Init(BrowserContext* browser_context, @@ -326,9 +326,9 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { InterstitialPageImpl* interstitial_page() const { return interstitial_page_; } // NotificationObserver implementation. - virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) override; + void Observe(int type, + const NotificationSource& source, + const NotificationDetails& details) override; // Returns whether the given RenderFrameHost (or its associated // RenderViewHost) is on the list of swapped out RenderFrameHosts. diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc index 18b5a68..38eef8c 100644 --- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc +++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc @@ -1151,7 +1151,7 @@ class RenderViewHostDestructionObserver : public WebContentsObserver { public: explicit RenderViewHostDestructionObserver(WebContents* web_contents) : WebContentsObserver(web_contents) {} - virtual ~RenderViewHostDestructionObserver() {} + ~RenderViewHostDestructionObserver() override {} void EnsureRVHGetsDestructed(RenderViewHost* rvh) { watched_render_view_hosts_.insert(rvh); } @@ -1161,7 +1161,7 @@ class RenderViewHostDestructionObserver : public WebContentsObserver { private: // WebContentsObserver implementation: - virtual void RenderViewDeleted(RenderViewHost* rvh) override { + void RenderViewDeleted(RenderViewHost* rvh) override { watched_render_view_hosts_.erase(rvh); } @@ -1390,7 +1390,7 @@ class RFHMProcessPerTabTest : public RenderFrameHostManagerTest { public: RFHMProcessPerTabTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) override { + void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(switches::kProcessPerTab); } }; diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc index c718043..f74e412 100644 --- a/content/browser/frame_host/render_frame_host_manager_unittest.cc +++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc @@ -51,32 +51,32 @@ class RenderFrameHostManagerTestWebUIControllerFactory RenderFrameHostManagerTestWebUIControllerFactory() : should_create_webui_(false) { } - virtual ~RenderFrameHostManagerTestWebUIControllerFactory() {} + ~RenderFrameHostManagerTestWebUIControllerFactory() override {} void set_should_create_webui(bool should_create_webui) { should_create_webui_ = should_create_webui; } // WebUIFactory implementation. - virtual WebUIController* CreateWebUIControllerForURL( - WebUI* web_ui, const GURL& url) const override { + WebUIController* CreateWebUIControllerForURL(WebUI* web_ui, + const GURL& url) const override { if (!(should_create_webui_ && HasWebUIScheme(url))) return NULL; return new WebUIController(web_ui); } - virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context, - const GURL& url) const override { + WebUI::TypeID GetWebUIType(BrowserContext* browser_context, + const GURL& url) const override { return WebUI::kNoWebUI; } - virtual bool UseWebUIForURL(BrowserContext* browser_context, - const GURL& url) const override { + bool UseWebUIForURL(BrowserContext* browser_context, + const GURL& url) const override { return HasWebUIScheme(url); } - virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context, - const GURL& url) const override { + bool UseWebUIBindingsForURL(BrowserContext* browser_context, + const GURL& url) const override { return HasWebUIScheme(url); } @@ -89,11 +89,11 @@ class RenderFrameHostManagerTestWebUIControllerFactory class BeforeUnloadFiredWebContentsDelegate : public WebContentsDelegate { public: BeforeUnloadFiredWebContentsDelegate() {} - virtual ~BeforeUnloadFiredWebContentsDelegate() {} + ~BeforeUnloadFiredWebContentsDelegate() override {} - virtual void BeforeUnloadFired(WebContents* web_contents, - bool proceed, - bool* proceed_to_fire_unload) override { + void BeforeUnloadFired(WebContents* web_contents, + bool proceed, + bool* proceed_to_fire_unload) override { *proceed_to_fire_unload = proceed; } @@ -104,9 +104,9 @@ class BeforeUnloadFiredWebContentsDelegate : public WebContentsDelegate { class CloseWebContentsDelegate : public WebContentsDelegate { public: CloseWebContentsDelegate() : close_called_(false) {} - virtual ~CloseWebContentsDelegate() {} + ~CloseWebContentsDelegate() override {} - virtual void CloseContents(WebContents* web_contents) override { + void CloseContents(WebContents* web_contents) override { close_called_ = true; } @@ -129,7 +129,7 @@ class RenderViewHostDeletedObserver : public WebContentsObserver { deleted_(false) { } - virtual void RenderViewDeleted(RenderViewHost* render_view_host) override { + void RenderViewDeleted(RenderViewHost* render_view_host) override { if (render_view_host->GetProcess()->GetID() == process_id_ && render_view_host->GetRoutingID() == routing_id_) { deleted_ = true; @@ -157,7 +157,7 @@ class RenderFrameHostCreatedObserver : public WebContentsObserver { created_(false) { } - virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override { + void RenderFrameCreated(RenderFrameHost* render_frame_host) override { created_ = true; } @@ -182,7 +182,7 @@ class RenderFrameHostDeletedObserver : public WebContentsObserver { deleted_(false) { } - virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override { + void RenderFrameDeleted(RenderFrameHost* render_frame_host) override { if (render_frame_host->GetProcess()->GetID() == process_id_ && render_frame_host->GetRoutingID() == routing_id_) { deleted_ = true; @@ -213,13 +213,12 @@ class PluginFaviconMessageObserver : public WebContentsObserver { plugin_crashed_(false), favicon_received_(false) { } - virtual void PluginCrashed(const base::FilePath& plugin_path, - base::ProcessId plugin_pid) override { + void PluginCrashed(const base::FilePath& plugin_path, + base::ProcessId plugin_pid) override { plugin_crashed_ = true; } - virtual void DidUpdateFaviconURL( - const std::vector<FaviconURL>& candidates) override { + void DidUpdateFaviconURL(const std::vector<FaviconURL>& candidates) override { favicon_received_ = true; } @@ -248,7 +247,7 @@ class FrameLifetimeConsistencyChecker : public WebContentsObserver { RenderFrameCreated(web_contents->GetMainFrame()); } - virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override { + void RenderFrameCreated(RenderFrameHost* render_frame_host) override { std::pair<int, int> routing_pair = std::make_pair(render_frame_host->GetProcess()->GetID(), render_frame_host->GetRoutingID()); @@ -264,7 +263,7 @@ class FrameLifetimeConsistencyChecker : public WebContentsObserver { } } - virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override { + void RenderFrameDeleted(RenderFrameHost* render_frame_host) override { std::pair<int, int> routing_pair = std::make_pair(render_frame_host->GetProcess()->GetID(), render_frame_host->GetRoutingID()); @@ -750,8 +749,7 @@ class RenderViewHostDestroyer : public WebContentsObserver { render_view_host_(render_view_host), web_contents_(web_contents) {} - virtual void RenderViewDeleted( - RenderViewHost* render_view_host) override { + void RenderViewDeleted(RenderViewHost* render_view_host) override { if (render_view_host == render_view_host_) delete web_contents_; } diff --git a/content/browser/frame_host/render_frame_message_filter.h b/content/browser/frame_host/render_frame_message_filter.h index b3d76b6..0de54b1 100644 --- a/content/browser/frame_host/render_frame_message_filter.h +++ b/content/browser/frame_host/render_frame_message_filter.h @@ -21,10 +21,10 @@ class RenderFrameMessageFilter : public BrowserMessageFilter { RenderFrameMessageFilter(int render_process_id, RenderWidgetHelper* render_widget_helper); - virtual bool OnMessageReceived(const IPC::Message& message) override; + bool OnMessageReceived(const IPC::Message& message) override; private: - virtual ~RenderFrameMessageFilter(); + ~RenderFrameMessageFilter() override; void OnCreateChildFrame(int parent_routing_id, const std::string& frame_name, diff --git a/content/browser/frame_host/render_frame_proxy_host.h b/content/browser/frame_host/render_frame_proxy_host.h index 29933af..ed3235c 100644 --- a/content/browser/frame_host/render_frame_proxy_host.h +++ b/content/browser/frame_host/render_frame_proxy_host.h @@ -59,7 +59,7 @@ class RenderFrameProxyHost RenderFrameProxyHost(SiteInstance* site_instance, FrameTreeNode* frame_tree_node); - virtual ~RenderFrameProxyHost(); + ~RenderFrameProxyHost() override; RenderProcessHost* GetProcess() { return site_instance_->GetProcess(); @@ -93,10 +93,10 @@ class RenderFrameProxyHost scoped_ptr<RenderFrameHostImpl> PassFrameHostOwnership(); // IPC::Sender - virtual bool Send(IPC::Message* msg) override; + bool Send(IPC::Message* msg) override; // IPC::Listener - virtual bool OnMessageReceived(const IPC::Message& msg) override; + bool OnMessageReceived(const IPC::Message& msg) override; CrossProcessFrameConnector* cross_process_frame_connector() { return cross_process_frame_connector_.get(); diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h index 4ca0716..4774d55 100644 --- a/content/browser/frame_host/render_widget_host_view_child_frame.h +++ b/content/browser/frame_host/render_widget_host_view_child_frame.h @@ -28,7 +28,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame : public RenderWidgetHostViewBase { public: explicit RenderWidgetHostViewChildFrame(RenderWidgetHost* widget); - virtual ~RenderWidgetHostViewChildFrame(); + ~RenderWidgetHostViewChildFrame() override; void set_cross_process_frame_connector( CrossProcessFrameConnector* frame_connector) { @@ -36,93 +36,90 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame } // RenderWidgetHostView implementation. - virtual void InitAsChild(gfx::NativeView parent_view) override; - virtual RenderWidgetHost* GetRenderWidgetHost() const override; - virtual void SetSize(const gfx::Size& size) override; - virtual void SetBounds(const gfx::Rect& rect) override; - virtual void Focus() override; - virtual bool HasFocus() const override; - virtual bool IsSurfaceAvailableForCopy() const override; - virtual void Show() override; - virtual void Hide() override; - virtual bool IsShowing() override; - virtual gfx::Rect GetViewBounds() const override; - virtual gfx::Vector2dF GetLastScrollOffset() const override; - virtual gfx::NativeView GetNativeView() const override; - virtual gfx::NativeViewId GetNativeViewId() const override; - virtual gfx::NativeViewAccessible GetNativeViewAccessible() override; - virtual void SetBackgroundOpaque(bool opaque) override; - virtual gfx::Size GetPhysicalBackingSize() const override; + void InitAsChild(gfx::NativeView parent_view) override; + RenderWidgetHost* GetRenderWidgetHost() const override; + void SetSize(const gfx::Size& size) override; + void SetBounds(const gfx::Rect& rect) override; + void Focus() override; + bool HasFocus() const override; + bool IsSurfaceAvailableForCopy() const override; + void Show() override; + void Hide() override; + bool IsShowing() override; + gfx::Rect GetViewBounds() const override; + gfx::Vector2dF GetLastScrollOffset() const override; + gfx::NativeView GetNativeView() const override; + gfx::NativeViewId GetNativeViewId() const override; + gfx::NativeViewAccessible GetNativeViewAccessible() override; + void SetBackgroundOpaque(bool opaque) override; + gfx::Size GetPhysicalBackingSize() const override; // RenderWidgetHostViewBase implementation. - virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, - const gfx::Rect& pos) override; - virtual void InitAsFullscreen( - RenderWidgetHostView* reference_host_view) override; - virtual void WasShown() override; - virtual void WasHidden() override; - virtual void MovePluginWindows( - const std::vector<WebPluginGeometry>& moves) override; - virtual void Blur() override; - virtual void UpdateCursor(const WebCursor& cursor) override; - virtual void SetIsLoading(bool is_loading) override; - virtual void TextInputTypeChanged(ui::TextInputType type, - ui::TextInputMode input_mode, - bool can_compose_inline) override; - virtual void ImeCancelComposition() override; + void InitAsPopup(RenderWidgetHostView* parent_host_view, + const gfx::Rect& pos) override; + void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override; + void WasShown() override; + void WasHidden() override; + void MovePluginWindows(const std::vector<WebPluginGeometry>& moves) override; + void Blur() override; + void UpdateCursor(const WebCursor& cursor) override; + void SetIsLoading(bool is_loading) override; + void TextInputTypeChanged(ui::TextInputType type, + ui::TextInputMode input_mode, + bool can_compose_inline) override; + void ImeCancelComposition() override; #if defined(OS_MACOSX) || defined(USE_AURA) - virtual void ImeCompositionRangeChanged( + void ImeCompositionRangeChanged( const gfx::Range& range, const std::vector<gfx::Rect>& character_bounds) override; #endif - virtual void RenderProcessGone(base::TerminationStatus status, - int error_code) override; - virtual void Destroy() override; - virtual void SetTooltipText(const base::string16& tooltip_text) override; - virtual void SelectionChanged(const base::string16& text, - size_t offset, - const gfx::Range& range) override; - virtual void SelectionBoundsChanged( + void RenderProcessGone(base::TerminationStatus status, + int error_code) override; + void Destroy() override; + void SetTooltipText(const base::string16& tooltip_text) override; + void SelectionChanged(const base::string16& text, + size_t offset, + const gfx::Range& range) override; + void SelectionBoundsChanged( const ViewHostMsg_SelectionBounds_Params& params) override; - virtual void CopyFromCompositingSurface( + void CopyFromCompositingSurface( const gfx::Rect& src_subrect, const gfx::Size& dst_size, const base::Callback<void(bool, const SkBitmap&)>& callback, const SkColorType color_type) override; - virtual void CopyFromCompositingSurfaceToVideoFrame( + void CopyFromCompositingSurfaceToVideoFrame( const gfx::Rect& src_subrect, const scoped_refptr<media::VideoFrame>& target, const base::Callback<void(bool)>& callback) override; - virtual bool CanCopyToVideoFrame() const override; - virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) override; - virtual void OnSwapCompositorFrame( - uint32 output_surface_id, - scoped_ptr<cc::CompositorFrame> frame) override; - virtual void GetScreenInfo(blink::WebScreenInfo* results) override; - virtual gfx::Rect GetBoundsInRootWindow() override; - virtual gfx::GLSurfaceHandle GetCompositingSurface() override; + bool CanCopyToVideoFrame() const override; + bool HasAcceleratedSurface(const gfx::Size& desired_size) override; + void OnSwapCompositorFrame(uint32 output_surface_id, + scoped_ptr<cc::CompositorFrame> frame) override; + void GetScreenInfo(blink::WebScreenInfo* results) override; + gfx::Rect GetBoundsInRootWindow() override; + gfx::GLSurfaceHandle GetCompositingSurface() override; #if defined(USE_AURA) virtual void ProcessAckedTouchEvent( const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) override; #endif // defined(USE_AURA) - virtual bool LockMouse() override; - virtual void UnlockMouse() override; + bool LockMouse() override; + void UnlockMouse() override; #if defined(OS_MACOSX) // RenderWidgetHostView implementation. - virtual void SetActive(bool active) override; - virtual void SetTakesFocusOnlyOnMouseDown(bool flag) override; - virtual void SetWindowVisibility(bool visible) override; - virtual void WindowFrameChanged() override; - virtual void ShowDefinitionForSelection() override; - virtual bool SupportsSpeech() const override; - virtual void SpeakSelection() override; - virtual bool IsSpeaking() const override; - virtual void StopSpeaking() override; + void SetActive(bool active) override; + void SetTakesFocusOnlyOnMouseDown(bool flag) override; + void SetWindowVisibility(bool visible) override; + void WindowFrameChanged() override; + void ShowDefinitionForSelection() override; + bool SupportsSpeech() const override; + void SpeakSelection() override; + bool IsSpeaking() const override; + void StopSpeaking() override; // RenderWidgetHostViewBase implementation. - virtual bool PostProcessEventForPluginIme( + bool PostProcessEventForPluginIme( const NativeWebKeyboardEvent& event) override; #endif // defined(OS_MACOSX) @@ -137,10 +134,10 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame gfx::NativeViewAccessible accessible_parent) override; virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override; #endif - virtual BrowserAccessibilityManager* CreateBrowserAccessibilityManager( + BrowserAccessibilityManager* CreateBrowserAccessibilityManager( BrowserAccessibilityDelegate* delegate) override; - virtual SkColorType PreferredReadbackFormat() override; + SkColorType PreferredReadbackFormat() override; protected: friend class RenderWidgetHostView; diff --git a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc index 95b4eb3..bdf6ff2 100644 --- a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc +++ b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc @@ -20,7 +20,7 @@ namespace { class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { public: MockRenderWidgetHostDelegate() {} - virtual ~MockRenderWidgetHostDelegate() {} + ~MockRenderWidgetHostDelegate() override {} }; class RenderWidgetHostViewChildFrameTest : public testing::Test { diff --git a/content/browser/frame_host/render_widget_host_view_guest.h b/content/browser/frame_host/render_widget_host_view_guest.h index 30edf5f..2d6a880 100644 --- a/content/browser/frame_host/render_widget_host_view_guest.h +++ b/content/browser/frame_host/render_widget_host_view_guest.h @@ -43,86 +43,82 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest RenderWidgetHost* widget, BrowserPluginGuest* guest, base::WeakPtr<RenderWidgetHostViewBase> platform_view); - virtual ~RenderWidgetHostViewGuest(); + ~RenderWidgetHostViewGuest() override; bool OnMessageReceivedFromEmbedder(const IPC::Message& message, RenderWidgetHostImpl* embedder); // RenderWidgetHostView implementation. - virtual bool OnMessageReceived(const IPC::Message& msg) override; - virtual void InitAsChild(gfx::NativeView parent_view) override; - virtual void SetSize(const gfx::Size& size) override; - virtual void SetBounds(const gfx::Rect& rect) override; - virtual void Focus() override; - virtual bool HasFocus() const override; - virtual gfx::NativeView GetNativeView() const override; - virtual gfx::NativeViewId GetNativeViewId() const override; - virtual gfx::NativeViewAccessible GetNativeViewAccessible() override; - virtual gfx::Rect GetViewBounds() const override; - virtual void SetBackgroundOpaque(bool opaque) override; - virtual gfx::Size GetPhysicalBackingSize() const override; - virtual base::string16 GetSelectedText() const override; + bool OnMessageReceived(const IPC::Message& msg) override; + void InitAsChild(gfx::NativeView parent_view) override; + void SetSize(const gfx::Size& size) override; + void SetBounds(const gfx::Rect& rect) override; + void Focus() override; + bool HasFocus() const override; + gfx::NativeView GetNativeView() const override; + gfx::NativeViewId GetNativeViewId() const override; + gfx::NativeViewAccessible GetNativeViewAccessible() override; + gfx::Rect GetViewBounds() const override; + void SetBackgroundOpaque(bool opaque) override; + gfx::Size GetPhysicalBackingSize() const override; + base::string16 GetSelectedText() const override; // RenderWidgetHostViewBase implementation. - virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, - const gfx::Rect& pos) override; - virtual void InitAsFullscreen( - RenderWidgetHostView* reference_host_view) override; - virtual void WasShown() override; - virtual void WasHidden() override; - virtual void MovePluginWindows( - const std::vector<WebPluginGeometry>& moves) override; - virtual void UpdateCursor(const WebCursor& cursor) override; - virtual void SetIsLoading(bool is_loading) override; - virtual void TextInputTypeChanged(ui::TextInputType type, - ui::TextInputMode input_mode, - bool can_compose_inline) override; - virtual void ImeCancelComposition() override; + void InitAsPopup(RenderWidgetHostView* parent_host_view, + const gfx::Rect& pos) override; + void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override; + void WasShown() override; + void WasHidden() override; + void MovePluginWindows(const std::vector<WebPluginGeometry>& moves) override; + void UpdateCursor(const WebCursor& cursor) override; + void SetIsLoading(bool is_loading) override; + void TextInputTypeChanged(ui::TextInputType type, + ui::TextInputMode input_mode, + bool can_compose_inline) override; + void ImeCancelComposition() override; #if defined(OS_MACOSX) || defined(USE_AURA) - virtual void ImeCompositionRangeChanged( + void ImeCompositionRangeChanged( const gfx::Range& range, const std::vector<gfx::Rect>& character_bounds) override; #endif - virtual void RenderProcessGone(base::TerminationStatus status, - int error_code) override; - virtual void Destroy() override; - virtual void SetTooltipText(const base::string16& tooltip_text) override; - virtual void SelectionChanged(const base::string16& text, - size_t offset, - const gfx::Range& range) override; - virtual void SelectionBoundsChanged( + void RenderProcessGone(base::TerminationStatus status, + int error_code) override; + void Destroy() override; + void SetTooltipText(const base::string16& tooltip_text) override; + void SelectionChanged(const base::string16& text, + size_t offset, + const gfx::Range& range) override; + void SelectionBoundsChanged( const ViewHostMsg_SelectionBounds_Params& params) override; - virtual void CopyFromCompositingSurface( - const gfx::Rect& src_subrect, - const gfx::Size& dst_size, - CopyFromCompositingSurfaceCallback& callback, - const SkColorType color_type) override; - virtual void OnSwapCompositorFrame( - uint32 output_surface_id, - scoped_ptr<cc::CompositorFrame> frame) override; + void CopyFromCompositingSurface(const gfx::Rect& src_subrect, + const gfx::Size& dst_size, + CopyFromCompositingSurfaceCallback& callback, + const SkColorType color_type) override; + void OnSwapCompositorFrame(uint32 output_surface_id, + scoped_ptr<cc::CompositorFrame> frame) override; #if defined(USE_AURA) virtual void ProcessAckedTouchEvent( const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) override; #endif - virtual bool LockMouse() override; - virtual void UnlockMouse() override; - virtual void GetScreenInfo(blink::WebScreenInfo* results) override; + bool LockMouse() override; + void UnlockMouse() override; + void GetScreenInfo(blink::WebScreenInfo* results) override; #if defined(OS_MACOSX) // RenderWidgetHostView implementation. - virtual void SetActive(bool active) override; - virtual void SetTakesFocusOnlyOnMouseDown(bool flag) override; - virtual void SetWindowVisibility(bool visible) override; - virtual void WindowFrameChanged() override; - virtual void ShowDefinitionForSelection() override; - virtual bool SupportsSpeech() const override; - virtual void SpeakSelection() override; - virtual bool IsSpeaking() const override; - virtual void StopSpeaking() override; + void SetActive(bool active) override; + void SetTakesFocusOnlyOnMouseDown(bool flag) override; + void SetWindowVisibility(bool visible) override; + void WindowFrameChanged() override; + void ShowDefinitionForSelection() override; + bool SupportsSpeech() const override; + void SpeakSelection() override; + bool IsSpeaking() const override; + void StopSpeaking() override; // RenderWidgetHostViewBase implementation. - virtual bool PostProcessEventForPluginIme( + bool PostProcessEventForPluginIme( const NativeWebKeyboardEvent& event) override; #endif // defined(OS_MACOSX) @@ -144,11 +140,11 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest #endif // Overridden from ui::GestureEventHelper. - virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override; - virtual void DispatchGestureEvent(ui::GestureEvent* event) override; - virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) override; + bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override; + void DispatchGestureEvent(ui::GestureEvent* event) override; + void DispatchCancelTouchEvent(ui::TouchEvent* event) override; - virtual SkColorType PreferredReadbackFormat() override; + SkColorType PreferredReadbackFormat() override; protected: friend class RenderWidgetHostView; diff --git a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc index b658158..726d7a9 100644 --- a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc +++ b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc @@ -20,7 +20,7 @@ namespace { class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { public: MockRenderWidgetHostDelegate() {} - virtual ~MockRenderWidgetHostDelegate() {} + ~MockRenderWidgetHostDelegate() override {} }; class RenderWidgetHostViewGuestTest : public testing::Test { |