diff options
| author | piman <piman@chromium.org> | 2016-03-22 22:35:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-23 05:37:49 +0000 |
| commit | 45cf0b58103c62895d4e4c8223e798bf84a42345 (patch) | |
| tree | bbefec340b7923f7e95cf33f16985bc55c05a303 /content/browser | |
| parent | 75c4422d8fdabd231f40a6c9235f4512f0170268 (diff) | |
| download | chromium_src-45cf0b58103c62895d4e4c8223e798bf84a42345.zip chromium_src-45cf0b58103c62895d4e4c8223e798bf84a42345.tar.gz chromium_src-45cf0b58103c62895d4e4c8223e798bf84a42345.tar.bz2 | |
Remove [SG]etParentNativeViewAccessible
It's dead code:
1- RenderWidgetHostImpl::GetParentNativeViewAccessible is never called, so by
extension all the RenderWidgetHostDelegate implmentations are not called
2- Because of 1, WebContentsImpl::accessible_parent_ is set but never used, so
can be removed
3- All the RenderWidgetHostView*::SetParentNativeViewAccessible are trivial and
can be removed
4- Because of 2 and 3, WebContentsImpl::SetParentNativeViewAccessible does
nothing any more, can be removed.
BUG=None
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1815563006
Cr-Commit-Position: refs/heads/master@{#382796}
Diffstat (limited to 'content/browser')
21 files changed, 2 insertions, 146 deletions
diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc index 4d071e3..784c9b4 100644 --- a/content/browser/frame_host/interstitial_page_impl.cc +++ b/content/browser/frame_host/interstitial_page_impl.cc @@ -552,17 +552,6 @@ void InterstitialPageImpl::HandleKeyboardEvent( render_widget_host_delegate_->HandleKeyboardEvent(event); } -#if defined(OS_WIN) -gfx::NativeViewAccessible -InterstitialPageImpl::GetParentNativeViewAccessible() { - if (web_contents_) { - WebContentsImpl* wci = static_cast<WebContentsImpl*>(web_contents_); - return wci->GetParentNativeViewAccessible(); - } - return NULL; -} -#endif - WebContents* InterstitialPageImpl::web_contents() const { return web_contents_; } diff --git a/content/browser/frame_host/interstitial_page_impl.h b/content/browser/frame_host/interstitial_page_impl.h index 983fcca..f619d05 100644 --- a/content/browser/frame_host/interstitial_page_impl.h +++ b/content/browser/frame_host/interstitial_page_impl.h @@ -156,9 +156,6 @@ class CONTENT_EXPORT InterstitialPageImpl bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) override; void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override; -#if defined(OS_WIN) - gfx::NativeViewAccessible GetParentNativeViewAccessible() override; -#endif bool enabled() const { return enabled_; } WebContents* web_contents() const; diff --git a/content/browser/frame_host/render_frame_host_delegate.cc b/content/browser/frame_host/render_frame_host_delegate.cc index 03d9729..b9dca1d 100644 --- a/content/browser/frame_host/render_frame_host_delegate.cc +++ b/content/browser/frame_host/render_frame_host_delegate.cc @@ -88,11 +88,4 @@ scoped_ptr<WebUIImpl> RenderFrameHostDelegate::CreateWebUIForRenderFrameHost( return nullptr; } -#if defined(OS_WIN) -gfx::NativeViewAccessible - RenderFrameHostDelegate::GetParentNativeViewAccessible() { - return NULL; -} -#endif // defined(OS_WIN) - } // namespace content diff --git a/content/browser/frame_host/render_frame_host_delegate.h b/content/browser/frame_host/render_frame_host_delegate.h index 1ce4b78..1cec9c7 100644 --- a/content/browser/frame_host/render_frame_host_delegate.h +++ b/content/browser/frame_host/render_frame_host_delegate.h @@ -186,11 +186,6 @@ class CONTENT_EXPORT RenderFrameHostDelegate { // applies, returns null. virtual scoped_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(const GURL& url); -#if defined(OS_WIN) - // Returns the frame's parent's NativeViewAccessible. - virtual gfx::NativeViewAccessible GetParentNativeViewAccessible(); -#endif - protected: virtual ~RenderFrameHostDelegate() {} }; diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc index e989127..677db31 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc @@ -2455,22 +2455,7 @@ int RenderFrameHostImpl::GetProxyCount() { return frame_tree_node_->render_manager()->GetProxyCount(); } -#if defined(OS_WIN) - -void RenderFrameHostImpl::SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) { - RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>( - render_view_host_->GetWidget()->GetView()); - if (view) - view->SetParentNativeViewAccessible(accessible_parent); -} - -gfx::NativeViewAccessible -RenderFrameHostImpl::GetParentNativeViewAccessible() const { - return delegate_->GetParentNativeViewAccessible(); -} - -#elif defined(OS_MACOSX) +#if defined(OS_MACOSX) void RenderFrameHostImpl::DidSelectPopupMenuItem(int selected_index) { Send(new FrameMsg_SelectPopupMenuItem(routing_id_, selected_index)); diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h index 1808861..23ce45a 100644 --- a/content/browser/frame_host/render_frame_host_impl.h +++ b/content/browser/frame_host/render_frame_host_impl.h @@ -483,11 +483,7 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost, no_create_browser_accessibility_manager_for_testing_ = flag; } -#if defined(OS_WIN) - void SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent); - gfx::NativeViewAccessible GetParentNativeViewAccessible() const; -#elif defined(OS_MACOSX) +#if defined(OS_MACOSX) // Select popup menu related methods (for external popup menus). void DidSelectPopupMenuItem(int selected_index); void DidCancelPopupMenu(); diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc index 602be87..7232c54 100644 --- a/content/browser/frame_host/render_widget_host_view_child_frame.cc +++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc @@ -534,12 +534,6 @@ bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface( return false; } -#if defined(OS_WIN) -void RenderWidgetHostViewChildFrame::SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) { -} -#endif // defined(OS_WIN) - // cc::SurfaceFactoryClient implementation. void RenderWidgetHostViewChildFrame::ReturnResources( const cc::ReturnedResourceArray& resources) { 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 507fce5..fc5a2d2 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 @@ -164,10 +164,6 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame void LockCompositingSurface() override; void UnlockCompositingSurface() override; -#if defined(OS_WIN) - void SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) override; -#endif BrowserAccessibilityManager* CreateBrowserAccessibilityManager( BrowserAccessibilityDelegate* delegate, bool for_root_frame) override; diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc index e9516eb..7207257 100644 --- a/content/browser/frame_host/render_widget_host_view_guest.cc +++ b/content/browser/frame_host/render_widget_host_view_guest.cc @@ -511,12 +511,6 @@ void RenderWidgetHostViewGuest::UnlockCompositingSurface() { NOTIMPLEMENTED(); } -#if defined(OS_WIN) -void RenderWidgetHostViewGuest::SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) { -} -#endif - void RenderWidgetHostViewGuest::DestroyGuestView() { // Let our observers know we're going away, since we don't want any event // processing calls coming in after we release host_. 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 52f1f8b..a780224 100644 --- a/content/browser/frame_host/render_widget_host_view_guest.h +++ b/content/browser/frame_host/render_widget_host_view_guest.h @@ -134,11 +134,6 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest void LockCompositingSurface() override; void UnlockCompositingSurface() override; -#if defined(OS_WIN) - void SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) override; -#endif - void WheelEventAck(const blink::WebMouseWheelEvent& event, InputEventAckState ack_result) override; diff --git a/content/browser/renderer_host/render_widget_host_delegate.cc b/content/browser/renderer_host/render_widget_host_delegate.cc index c158a41..e08c7da 100644 --- a/content/browser/renderer_host/render_widget_host_delegate.cc +++ b/content/browser/renderer_host/render_widget_host_delegate.cc @@ -34,13 +34,6 @@ BrowserAccessibilityManager* return NULL; } -#if defined(OS_WIN) -gfx::NativeViewAccessible - RenderWidgetHostDelegate::GetParentNativeViewAccessible() { - return NULL; -} -#endif - // If a delegate does not override this, the RenderWidgetHostView will // assume it is the sole platform event consumer. RenderWidgetHostInputEventRouter* diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h index 9d20ade..d80d502 100644 --- a/content/browser/renderer_host/render_widget_host_delegate.h +++ b/content/browser/renderer_host/render_widget_host_delegate.h @@ -168,10 +168,6 @@ class CONTENT_EXPORT RenderWidgetHostDelegate { // Notification that the widget has lost the mouse lock. virtual void LostMouseLock(RenderWidgetHostImpl* render_widget_host) {} -#if defined(OS_WIN) - virtual gfx::NativeViewAccessible GetParentNativeViewAccessible(); -#endif - // Called when the widget has sent a compositor proto. This is used in Btlimp // mode with the RemoteChannel compositor. virtual void ForwardCompositorProto(RenderWidgetHostImpl* render_widget_host, diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 0f80e94..07fb77a 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -2190,11 +2190,4 @@ BrowserAccessibilityManager* delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; } -#if defined(OS_WIN) -gfx::NativeViewAccessible - RenderWidgetHostImpl::GetParentNativeViewAccessible() { - return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL; -} -#endif - } // namespace content diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index f9600fc..567d51e 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -475,10 +475,6 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost, void RejectMouseLockOrUnlockIfNecessary(); -#if defined(OS_WIN) - gfx::NativeViewAccessible GetParentNativeViewAccessible(); -#endif - void set_renderer_initialized(bool renderer_initialized) { renderer_initialized_ = renderer_initialized; } diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index add56ff..efd5119 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -1071,12 +1071,6 @@ void RenderWidgetHostViewAura::DidStopFlinging() { selection_controller_client_->OnScrollCompleted(); } -#if defined(OS_WIN) -void RenderWidgetHostViewAura::SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) { -} -#endif - bool RenderWidgetHostViewAura::HasAcceleratedSurface( const gfx::Size& desired_size) { // Aura doesn't use GetBackingStore for accelerated pages, so it doesn't diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h index 245105f..3945709 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.h +++ b/content/browser/renderer_host/render_widget_host_view_aura.h @@ -207,11 +207,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura cc::SurfaceId original_surface, gfx::Point* transformed_point) override; -#if defined(OS_WIN) - void SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) override; -#endif - // Overridden from ui::TextInputClient: void SetCompositionText(const ui::CompositionText& composition) override; void ConfirmCompositionText() override; diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h index ff99d5f..d8cc6c9 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h @@ -378,11 +378,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView, const gfx::Range& range, const std::vector<gfx::Rect>& character_bounds) = 0; -#if defined(OS_WIN) - virtual void SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) = 0; -#endif - // Add and remove observers for lifetime event notifications. The order in // which notifications are sent to observers is undefined. Clients must be // sure to remove the observer before they go away. diff --git a/content/browser/renderer_host/render_widget_host_view_mus.cc b/content/browser/renderer_host/render_widget_host_view_mus.cc index 8b945da9..ebd0f47 100644 --- a/content/browser/renderer_host/render_widget_host_view_mus.cc +++ b/content/browser/renderer_host/render_widget_host_view_mus.cc @@ -316,9 +316,4 @@ void RenderWidgetHostViewMus::UnlockCompositingSurface() { NOTIMPLEMENTED(); } -#if defined(OS_WIN) -void RenderWidgetHostViewMus::SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) {} -#endif - } // namespace content diff --git a/content/browser/renderer_host/render_widget_host_view_mus.h b/content/browser/renderer_host/render_widget_host_view_mus.h index d63ae6e..2f5e875 100644 --- a/content/browser/renderer_host/render_widget_host_view_mus.h +++ b/content/browser/renderer_host/render_widget_host_view_mus.h @@ -121,11 +121,6 @@ class CONTENT_EXPORT RenderWidgetHostViewMus : public RenderWidgetHostViewBase { void LockCompositingSurface() override; void UnlockCompositingSurface() override; -#if defined(OS_WIN) - void SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) override; -#endif - RenderWidgetHostImpl* host_; aura::Window* aura_window_; diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 95eba77..1081285 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -317,9 +317,6 @@ WebContentsImpl::WebContentsImpl(BrowserContext* browser_context) controller_(this, browser_context), render_view_host_delegate_view_(NULL), created_with_opener_(false), -#if defined(OS_WIN) - accessible_parent_(NULL), -#endif frame_tree_(new NavigatorImpl(&controller_, this), this, this, @@ -919,16 +916,6 @@ bool WebContentsImpl::IsFullAccessibilityModeForTesting() const { return accessibility_mode_ == AccessibilityModeComplete; } -#if defined(OS_WIN) -void WebContentsImpl::SetParentNativeViewAccessible( -gfx::NativeViewAccessible accessible_parent) { - accessible_parent_ = accessible_parent; - RenderFrameHostImpl* rfh = GetMainFrame(); - if (rfh) - rfh->SetParentNativeViewAccessible(accessible_parent); -} -#endif - const PageImportanceSignals& WebContentsImpl::GetPageImportanceSignals() const { return page_importance_signals_; } @@ -3917,12 +3904,6 @@ bool WebContentsImpl::IsNeverVisible() { return delegate_->IsNeverVisible(this); } -#if defined(OS_WIN) -gfx::NativeViewAccessible WebContentsImpl::GetParentNativeViewAccessible() { - return accessible_parent_; -} -#endif - RenderViewHostDelegateView* WebContentsImpl::GetDelegateView() { return render_view_host_delegate_view_; } diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index 5255026..c800f53 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -257,10 +257,6 @@ class CONTENT_EXPORT WebContentsImpl void EnableTreeOnlyAccessibilityMode() override; bool IsTreeOnlyAccessibilityModeForTesting() const override; bool IsFullAccessibilityModeForTesting() const override; -#if defined(OS_WIN) - void SetParentNativeViewAccessible( - gfx::NativeViewAccessible accessible_parent) override; -#endif const PageImportanceSignals& GetPageImportanceSignals() const override; const base::string16& GetTitle() const override; int32_t GetMaxPageID() override; @@ -444,9 +440,6 @@ class CONTENT_EXPORT WebContentsImpl SiteInstance* source_site_instance) const override; void EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) override; scoped_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(const GURL& url) override; -#if defined(OS_WIN) - gfx::NativeViewAccessible GetParentNativeViewAccessible() override; -#endif // RenderViewHostDelegate ---------------------------------------------------- RenderViewHostDelegateView* GetDelegateView() override; @@ -1075,10 +1068,6 @@ class CONTENT_EXPORT WebContentsImpl // is closed. bool created_with_opener_; -#if defined(OS_WIN) - gfx::NativeViewAccessible accessible_parent_; -#endif - // Helper classes ------------------------------------------------------------ // Manages the frame tree of the page and process swaps in each node. |