Allow whitelisted content scripts to be injected in WebViews.

chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

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..b33f1dec82b425234821e665bd2bcb96a21faffa 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) {
 }
@@ -85,25 +84,13 @@ void ChromeWebViewGuestDelegate::OnAttachWebViewHelpers(
 
 void ChromeWebViewGuestDelegate::OnDidCommitProvisionalLoadForFrame(
     bool is_main_frame) {

[Fady Samuel, 2015/05/14 22:31:45]

Remove this method and remove it from WebViewGuestDelegate please?

[dmazzoni, 2015/05/14 22:50:46]

Done.

-  if (is_main_frame)
-    chromevox_injected_ = false;
 }
 
 void ChromeWebViewGuestDelegate::OnDidInitialize() {

[Fady Samuel, 2015/05/14 22:31:45]

Remove this method and remove it from WebViewGuestDelegate please?

[dmazzoni, 2015/05/14 22:50:46]

Done.

-#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) {

[Fady Samuel, 2015/05/14 22:31:45]

Remove this method and remove it from WebViewGuestDelegate please?

[dmazzoni, 2015/05/14 22:50:45]

Done.

-  if (!render_frame_host->GetParent())
-    InjectChromeVoxIfNeeded(render_frame_host->GetRenderViewHost());
 }
 
 void ChromeWebViewGuestDelegate::OnGuestDestroyed() {
@@ -149,33 +136,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