summaryrefslogtreecommitdiffstats
path: root/extensions/browser
diff options
context:
space:
mode:
authordtseng <dtseng@chromium.org>2015-06-09 15:11:04 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-09 22:11:43 +0000
commitd35baea6341e533124003af62a255868b1beb703 (patch)
tree5897bfae96df68f8607a479a80755efb6d317008 /extensions/browser
parentf91ef5151598b01fdca8ebf9ad94b01f4b1cf22e (diff)
downloadchromium_src-d35baea6341e533124003af62a255868b1beb703.zip
chromium_src-d35baea6341e533124003af62a255868b1beb703.tar.gz
chromium_src-d35baea6341e533124003af62a255868b1beb703.tar.bz2
Re-enable WebView ChromeVox manual script injection when accessibility status changes.
This is a partial revert of https://codereview.chromium.org/1140173003/ TEST=in certain contexts involving WebView, toggling on/off ChromeVox repeatedly does not break ChromeVox. BUG=496664 Review URL: https://codereview.chromium.org/1173523006 Cr-Commit-Position: refs/heads/master@{#333587}
Diffstat (limited to 'extensions/browser')
-rw-r--r--extensions/browser/guest_view/web_view/web_view_guest.cc2
-rw-r--r--extensions/browser/guest_view/web_view/web_view_guest_delegate.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index 8960f4c..71dac53 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -334,6 +334,8 @@ void WebViewGuest::DidInitialize(const base::DictionaryValue& create_params) {
content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
content::Source<WebContents>(web_contents()));
+ if (web_view_guest_delegate_)
+ web_view_guest_delegate_->OnDidInitialize();
AttachWebViewHelpers(web_contents());
rules_registry_id_ = GetOrGenerateRulesRegistryID(
diff --git a/extensions/browser/guest_view/web_view/web_view_guest_delegate.h b/extensions/browser/guest_view/web_view/web_view_guest_delegate.h
index 0ab06150..cf827ba 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest_delegate.h
+++ b/extensions/browser/guest_view/web_view/web_view_guest_delegate.h
@@ -38,6 +38,9 @@ class WebViewGuestDelegate {
// Called to attach helpers just after additional initialization is performed.
virtual void OnAttachWebViewHelpers(content::WebContents* contents) = 0;
+ // Called just after additional initialization is performed.
+ virtual void OnDidInitialize() = 0;
+
// Called immediately after the guest WebContents has been destroyed.
virtual void OnGuestDestroyed() = 0;