summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authordmazzoni <dmazzoni@chromium.org>2016-01-07 14:58:54 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-07 22:59:44 +0000
commit5ba638da61040c7fb9c05b42b0ce4a90fa22157c (patch)
treeb0d4eba77027761d9b2d6503caa77f9ec15bfb48 /extensions
parent720335c380bed526ee4397154150b2184fa07cb3 (diff)
downloadchromium_src-5ba638da61040c7fb9c05b42b0ce4a90fa22157c.zip
chromium_src-5ba638da61040c7fb9c05b42b0ce4a90fa22157c.tar.gz
chromium_src-5ba638da61040c7fb9c05b42b0ce4a90fa22157c.tar.bz2
Give the ChromeVox Panel an extension view type.
The ChromeVox Panel is a native window that whose contents is a WebContents displaying an extension page. Since r363368 the extension background isn't able to communicate with this extension page because it doesn't have a view type. BUG=573023 Review URL: https://codereview.chromium.org/1550983003 Cr-Commit-Position: refs/heads/master@{#368183}
Diffstat (limited to 'extensions')
-rw-r--r--extensions/browser/process_manager.cc2
-rw-r--r--extensions/common/view_type.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc
index c3eaad5..c0f7253 100644
--- a/extensions/browser/process_manager.cc
+++ b/extensions/browser/process_manager.cc
@@ -166,13 +166,13 @@ struct ProcessManager::ExtensionRenderFrameData {
switch (view_type) {
case VIEW_TYPE_APP_WINDOW:
case VIEW_TYPE_BACKGROUND_CONTENTS:
+ case VIEW_TYPE_COMPONENT:
case VIEW_TYPE_EXTENSION_DIALOG:
case VIEW_TYPE_EXTENSION_GUEST:
case VIEW_TYPE_EXTENSION_POPUP:
case VIEW_TYPE_LAUNCHER_PAGE:
case VIEW_TYPE_PANEL:
case VIEW_TYPE_TAB_CONTENTS:
- case VIEW_TYPE_VIRTUAL_KEYBOARD:
return true;
case VIEW_TYPE_INVALID:
diff --git a/extensions/common/view_type.h b/extensions/common/view_type.h
index bbe498d..5fc7c27 100644
--- a/extensions/common/view_type.h
+++ b/extensions/common/view_type.h
@@ -16,6 +16,7 @@ enum ViewType {
VIEW_TYPE_INVALID,
VIEW_TYPE_APP_WINDOW,
VIEW_TYPE_BACKGROUND_CONTENTS,
+ VIEW_TYPE_COMPONENT, // For custom parts of Chrome if no other type applies.
VIEW_TYPE_EXTENSION_BACKGROUND_PAGE,
VIEW_TYPE_EXTENSION_DIALOG,
VIEW_TYPE_EXTENSION_GUEST,
@@ -23,8 +24,7 @@ enum ViewType {
VIEW_TYPE_LAUNCHER_PAGE,
VIEW_TYPE_PANEL,
VIEW_TYPE_TAB_CONTENTS,
- VIEW_TYPE_VIRTUAL_KEYBOARD,
- VIEW_TYPE_LAST = VIEW_TYPE_VIRTUAL_KEYBOARD
+ VIEW_TYPE_LAST = VIEW_TYPE_TAB_CONTENTS
};
// Constant strings corresponding to the Type enumeration values. Used