| Index: chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
|
| diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
|
| index 170a56111249dc4fab8ee22858a3f9603cdbaa29..d257002079bf9d1d1820f59b8935cca57fa914b3 100644
|
| --- a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
|
| +++ b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
|
| @@ -35,7 +35,6 @@ namespace extensions {
|
| ChromeWebViewGuestDelegate::ChromeWebViewGuestDelegate(
|
| WebViewGuest* web_view_guest)
|
| : pending_context_menu_request_id_(0),
|
| - chromevox_injected_(false),
|
| web_view_guest_(web_view_guest),
|
| weak_ptr_factory_(this) {
|
| }
|
| @@ -83,29 +82,6 @@ void ChromeWebViewGuestDelegate::OnAttachWebViewHelpers(
|
| new ChromePDFWebContentsHelperClient()));
|
| }
|
|
|
| -void ChromeWebViewGuestDelegate::OnDidCommitProvisionalLoadForFrame(
|
| - bool is_main_frame) {
|
| - if (is_main_frame)
|
| - chromevox_injected_ = false;
|
| -}
|
| -
|
| -void ChromeWebViewGuestDelegate::OnDidInitialize() {
|
| -#if defined(OS_CHROMEOS)
|
| - chromeos::AccessibilityManager* accessibility_manager =
|
| - chromeos::AccessibilityManager::Get();
|
| - CHECK(accessibility_manager);
|
| - accessibility_subscription_ = accessibility_manager->RegisterCallback(
|
| - base::Bind(&ChromeWebViewGuestDelegate::OnAccessibilityStatusChanged,
|
| - weak_ptr_factory_.GetWeakPtr()));
|
| -#endif
|
| -}
|
| -
|
| -void ChromeWebViewGuestDelegate::OnDocumentLoadedInFrame(
|
| - content::RenderFrameHost* render_frame_host) {
|
| - if (!render_frame_host->GetParent())
|
| - InjectChromeVoxIfNeeded(render_frame_host->GetRenderViewHost());
|
| -}
|
| -
|
| void ChromeWebViewGuestDelegate::OnGuestDestroyed() {
|
| // Clean up custom context menu items for this guest.
|
| MenuManager* menu_manager = MenuManager::Get(
|
| @@ -149,33 +125,4 @@ void ChromeWebViewGuestDelegate::OnShowContextMenu(
|
| menu_delegate->ShowMenu(pending_menu_.Pass());
|
| }
|
|
|
| -void ChromeWebViewGuestDelegate::InjectChromeVoxIfNeeded(
|
| - content::RenderViewHost* render_view_host) {
|
| -#if defined(OS_CHROMEOS)
|
| - if (!chromevox_injected_) {
|
| - chromeos::AccessibilityManager* manager =
|
| - chromeos::AccessibilityManager::Get();
|
| - if (manager && manager->IsSpokenFeedbackEnabled()) {
|
| - manager->InjectChromeVox(render_view_host);
|
| - chromevox_injected_ = true;
|
| - }
|
| - }
|
| -#endif
|
| -}
|
| -
|
| -#if defined(OS_CHROMEOS)
|
| -void ChromeWebViewGuestDelegate::OnAccessibilityStatusChanged(
|
| - const chromeos::AccessibilityStatusEventDetails& details) {
|
| - if (details.notification_type == chromeos::ACCESSIBILITY_MANAGER_SHUTDOWN) {
|
| - accessibility_subscription_.reset();
|
| - } else if (details.notification_type ==
|
| - chromeos::ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK) {
|
| - if (details.enabled)
|
| - InjectChromeVoxIfNeeded(guest_web_contents()->GetRenderViewHost());
|
| - else
|
| - chromevox_injected_ = false;
|
| - }
|
| -}
|
| -#endif
|
| -
|
| } // namespace extensions
|
|
|