summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2014-09-11 12:27:10 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-11 19:42:27 +0000
commit2d19fb1182fe156ff09b587d112da8ede8ccec58 (patch)
tree17e0edd6df588988cc5a5bee34283cdac37c655e
parent9f749456f195f5042dc9827241c10dbe7fc24801 (diff)
downloadchromium_src-2d19fb1182fe156ff09b587d112da8ede8ccec58.zip
chromium_src-2d19fb1182fe156ff09b587d112da8ede8ccec58.tar.gz
chromium_src-2d19fb1182fe156ff09b587d112da8ede8ccec58.tar.bz2
GuestView: Double clicking a GuestView type in task manager should activate the embedder.
This is a useful debug aid and better matches the behavior of tabs. BUG=none Review URL: https://codereview.chromium.org/564933002 Cr-Commit-Position: refs/heads/master@{#294443}
-rw-r--r--extensions/browser/guest_view/guest_view_base.cc16
-rw-r--r--extensions/browser/guest_view/guest_view_base.h3
2 files changed, 19 insertions, 0 deletions
diff --git a/extensions/browser/guest_view/guest_view_base.cc b/extensions/browser/guest_view/guest_view_base.cc
index fac9da3..1b0effe 100644
--- a/extensions/browser/guest_view/guest_view_base.cc
+++ b/extensions/browser/guest_view/guest_view_base.cc
@@ -385,6 +385,22 @@ void GuestViewBase::WebContentsDestroyed() {
delete this;
}
+void GuestViewBase::ActivateContents(WebContents* web_contents) {
+ if (!attached() || !embedder_web_contents()->GetDelegate())
+ return;
+
+ embedder_web_contents()->GetDelegate()->ActivateContents(
+ embedder_web_contents());
+}
+
+void GuestViewBase::DeactivateContents(WebContents* web_contents) {
+ if (!attached() || !embedder_web_contents()->GetDelegate())
+ return;
+
+ embedder_web_contents()->GetDelegate()->DeactivateContents(
+ embedder_web_contents());
+}
+
void GuestViewBase::RunFileChooser(WebContents* web_contents,
const content::FileChooserParams& params) {
if (!attached() || !embedder_web_contents()->GetDelegate())
diff --git a/extensions/browser/guest_view/guest_view_base.h b/extensions/browser/guest_view/guest_view_base.h
index cc43ba4..1c0625c 100644
--- a/extensions/browser/guest_view/guest_view_base.h
+++ b/extensions/browser/guest_view/guest_view_base.h
@@ -273,6 +273,9 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
virtual void WebContentsDestroyed() OVERRIDE FINAL;
// WebContentsDelegate implementation.
+ virtual void ActivateContents(content::WebContents* contents) OVERRIDE FINAL;
+ virtual void DeactivateContents(
+ content::WebContents* contents) OVERRIDE FINAL;
virtual void RunFileChooser(
content::WebContents* web_contents,
const content::FileChooserParams& params) OVERRIDE;