| Index: content/browser/web_contents/web_contents_impl.h
|
| diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
| index 91b2d4b8d15552ed5569be5320a068d407ba6a33..b00164237cf0c622348f86d49adeb9aa8f420c1c 100644
|
| --- a/content/browser/web_contents/web_contents_impl.h
|
| +++ b/content/browser/web_contents/web_contents_impl.h
|
| @@ -23,7 +23,6 @@
|
| #include "content/browser/frame_host/render_frame_host_manager.h"
|
| #include "content/browser/renderer_host/render_view_host_delegate.h"
|
| #include "content/browser/renderer_host/render_widget_host_delegate.h"
|
| -#include "content/common/accessibility_mode_enums.h"
|
| #include "content/common/content_export.h"
|
| #include "content/public/browser/color_chooser.h"
|
| #include "content/public/browser/notification_observer.h"
|
| @@ -96,8 +95,6 @@
|
| const WebContents::CreateParams& params,
|
| WebContentsImpl* opener);
|
|
|
| - static std::vector<WebContentsImpl*> GetAllWebContents();
|
| -
|
| // Returns the opener WebContentsImpl, if any. This can be set to null if the
|
| // opener is closed or the page clears its window.opener.
|
| WebContentsImpl* opener() const { return opener_; }
|
| @@ -173,19 +170,6 @@
|
| }
|
|
|
| bool should_normally_be_visible() { return should_normally_be_visible_; }
|
| -
|
| - // Broadcasts the mode change to all frames.
|
| - void SetAccessibilityMode(AccessibilityMode mode);
|
| -
|
| - // Adds the given accessibility mode to the current accessibility mode
|
| - // bitmap.
|
| - void AddAccessibilityMode(AccessibilityMode mode);
|
| -
|
| - // Removes the given accessibility mode from the current accessibility
|
| - // mode bitmap, managing the bits that are shared with other modes such
|
| - // that a bit will only be turned off when all modes that depend on it
|
| - // have been removed.
|
| - void RemoveAccessibilityMode(AccessibilityMode mode);
|
|
|
| // WebContents ------------------------------------------------------
|
| virtual WebContentsDelegate* GetDelegate() OVERRIDE;
|
| @@ -212,9 +196,6 @@
|
| virtual WebUI* GetCommittedWebUI() const OVERRIDE;
|
| virtual void SetUserAgentOverride(const std::string& override) OVERRIDE;
|
| virtual const std::string& GetUserAgentOverride() const OVERRIDE;
|
| - virtual void EnableTreeOnlyAccessibilityMode() OVERRIDE;
|
| - virtual bool IsTreeOnlyAccessibilityModeForTesting() const OVERRIDE;
|
| - virtual bool IsFullAccessibilityModeForTesting() const OVERRIDE;
|
| #if defined(OS_WIN)
|
| virtual void SetParentNativeViewAccessible(
|
| gfx::NativeViewAccessible accessible_parent) OVERRIDE;
|
| @@ -374,12 +355,6 @@
|
| const std::string& encoding) OVERRIDE;
|
| virtual WebContents* GetAsWebContents() OVERRIDE;
|
| virtual bool IsNeverVisible() OVERRIDE;
|
| - virtual AccessibilityMode GetAccessibilityMode() const OVERRIDE;
|
| - virtual void AccessibilityEventReceived(
|
| - const std::vector<AXEventNotificationDetails>& details) OVERRIDE;
|
| -#if defined(OS_WIN)
|
| - virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE;
|
| -#endif
|
|
|
| // RenderViewHostDelegate ----------------------------------------------------
|
| virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE;
|
| @@ -468,6 +443,8 @@
|
| SiteInstance* instance) OVERRIDE;
|
| virtual SessionStorageNamespaceMap GetSessionStorageNamespaceMap() OVERRIDE;
|
| virtual FrameTree* GetFrameTree() OVERRIDE;
|
| + virtual void AccessibilityEventReceived(
|
| + const std::vector<AXEventNotificationDetails>& details) OVERRIDE;
|
|
|
| // NavigatorDelegate ---------------------------------------------------------
|
|
|
| @@ -532,10 +509,9 @@
|
| const blink::WebGestureEvent& event) OVERRIDE;
|
| virtual void DidSendScreenRects(RenderWidgetHostImpl* rwh) OVERRIDE;
|
| virtual void OnTouchEmulationEnabled(bool enabled) OVERRIDE;
|
| - virtual BrowserAccessibilityManager* GetRootBrowserAccessibilityManager()
|
| - OVERRIDE;
|
| - virtual BrowserAccessibilityManager*
|
| - GetOrCreateRootBrowserAccessibilityManager() OVERRIDE;
|
| +#if defined(OS_WIN)
|
| + virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE;
|
| +#endif
|
|
|
| // RenderFrameHostManager::Delegate ------------------------------------------
|
|
|
| @@ -1178,10 +1154,6 @@
|
| scoped_ptr<ScreenOrientationDispatcherHost>
|
| screen_orientation_dispatcher_host_;
|
|
|
| - // The accessibility mode for all frames. This is queried when each frame
|
| - // is created, and broadcast to all frames when it changes.
|
| - AccessibilityMode accessibility_mode_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
|
| };
|
|
|
|
|