diff options
9 files changed, 20 insertions, 12 deletions
diff --git a/chrome/browser/chromeos/accessibility/chromevox_panel.cc b/chrome/browser/chromeos/accessibility/chromevox_panel.cc index 28a8f90..3710d53 100644 --- a/chrome/browser/chromeos/accessibility/chromevox_panel.cc +++ b/chrome/browser/chromeos/accessibility/chromevox_panel.cc @@ -8,8 +8,10 @@ #include "base/macros.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/chromeos/accessibility/chromevox_panel.h" +#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/view_type_utils.h" #include "ui/chromeos/accessibility_types.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/layout/fill_layout.h" @@ -64,8 +66,12 @@ ChromeVoxPanel::ChromeVoxPanel(content::BrowserContext* browser_context) url += kChromeVoxPanelRelativeUrl; views::WebView* web_view = new views::WebView(browser_context); + content::WebContents* contents = web_view->GetWebContents(); web_contents_observer_.reset( - new ChromeVoxPanelWebContentsObserver(web_view->GetWebContents(), this)); + new ChromeVoxPanelWebContentsObserver(contents, this)); + extensions::SetViewType(contents, extensions::VIEW_TYPE_COMPONENT); + extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( + contents); web_view->LoadInitialURL(GURL(url)); web_view_ = web_view; diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc index 72d23d1..b4acbd5 100644 --- a/chrome/browser/chromeos/login/ui/webui_login_view.cc +++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc @@ -41,6 +41,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/common/renderer_preferences.h" +#include "extensions/browser/view_type_utils.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" @@ -196,6 +197,7 @@ void WebUILoginView::Init() { SetDelegate(this); web_contents->SetDelegate(this); + extensions::SetViewType(web_contents, extensions::VIEW_TYPE_COMPONENT); extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( web_contents); content::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs(); diff --git a/chrome/browser/extensions/api/developer_private/inspectable_views_finder.cc b/chrome/browser/extensions/api/developer_private/inspectable_views_finder.cc index e588caf..f12df3a 100644 --- a/chrome/browser/extensions/api/developer_private/inspectable_views_finder.cc +++ b/chrome/browser/extensions/api/developer_private/inspectable_views_finder.cc @@ -54,6 +54,9 @@ InspectableViewsFinder::View InspectableViewsFinder::ConstructView( case VIEW_TYPE_BACKGROUND_CONTENTS: view->type = api::developer_private::VIEW_TYPE_BACKGROUND_CONTENTS; break; + case VIEW_TYPE_COMPONENT: + view->type = api::developer_private::VIEW_TYPE_COMPONENT; + break; case VIEW_TYPE_EXTENSION_BACKGROUND_PAGE: view->type = api::developer_private::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE; break; @@ -75,9 +78,6 @@ InspectableViewsFinder::View InspectableViewsFinder::ConstructView( case VIEW_TYPE_TAB_CONTENTS: view->type = api::developer_private::VIEW_TYPE_TAB_CONTENTS; break; - case VIEW_TYPE_VIRTUAL_KEYBOARD: - view->type = api::developer_private::VIEW_TYPE_VIRTUAL_KEYBOARD; - break; default: NOTREACHED(); } diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc index 2849e12..9221e8d 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc @@ -358,11 +358,11 @@ void ChromeExtensionsBrowserClient::AttachExtensionTaskManagerTag( ViewType view_type) { switch (view_type) { case VIEW_TYPE_APP_WINDOW: + case VIEW_TYPE_COMPONENT: case VIEW_TYPE_EXTENSION_BACKGROUND_PAGE: case VIEW_TYPE_EXTENSION_DIALOG: case VIEW_TYPE_EXTENSION_POPUP: case VIEW_TYPE_LAUNCHER_PAGE: - case VIEW_TYPE_VIRTUAL_KEYBOARD: // These are the only types that are tracked by the ExtensionTag. task_management::WebContentsTags::CreateForExtension(web_contents, view_type); diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc index e553c34..1d7a04d 100644 --- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc +++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc @@ -424,7 +424,7 @@ void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType( if (view_type == extensions::VIEW_TYPE_TAB_CONTENTS || view_type == extensions::VIEW_TYPE_APP_WINDOW || view_type == extensions::VIEW_TYPE_LAUNCHER_PAGE || - view_type == extensions::VIEW_TYPE_VIRTUAL_KEYBOARD || + view_type == extensions::VIEW_TYPE_COMPONENT || view_type == extensions::VIEW_TYPE_EXTENSION_POPUP || view_type == extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { // If it is a tab, we can check for permission. For apps, this means diff --git a/chrome/browser/ui/ash/chrome_keyboard_ui.cc b/chrome/browser/ui/ash/chrome_keyboard_ui.cc index 18efdce..71408e6 100644 --- a/chrome/browser/ui/ash/chrome_keyboard_ui.cc +++ b/chrome/browser/ui/ash/chrome_keyboard_ui.cc @@ -143,7 +143,7 @@ void ChromeKeyboardUI::RequestAudioInput( } void ChromeKeyboardUI::SetupWebContents(content::WebContents* contents) { - extensions::SetViewType(contents, extensions::VIEW_TYPE_VIRTUAL_KEYBOARD); + extensions::SetViewType(contents, extensions::VIEW_TYPE_COMPONENT); extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( contents); Observe(contents); diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl index 882c7db..564b1cb 100644 --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl @@ -62,14 +62,14 @@ namespace developerPrivate { enum ViewType { APP_WINDOW, BACKGROUND_CONTENTS, + COMPONENT, EXTENSION_BACKGROUND_PAGE, EXTENSION_DIALOG, EXTENSION_GUEST, EXTENSION_POPUP, LAUNCHER_PAGE, PANEL, - TAB_CONTENTS, - VIRTUAL_KEYBOARD + TAB_CONTENTS }; enum ErrorType { 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 |