diff options
author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 04:09:23 +0000 |
---|---|---|
committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 04:09:23 +0000 |
commit | 46babb29a2e0f45d940a3197c74ddfa3b7abb7bf (patch) | |
tree | 59aa719c22084d760027e0b38d9d4d668342dda6 /chrome/browser/renderer_host/chrome_render_view_host_observer.cc | |
parent | cd2c46e818a21cef01ccdf7c13bf3577d228e894 (diff) | |
download | chromium_src-46babb29a2e0f45d940a3197c74ddfa3b7abb7bf.zip chromium_src-46babb29a2e0f45d940a3197c74ddfa3b7abb7bf.tar.gz chromium_src-46babb29a2e0f45d940a3197c74ddfa3b7abb7bf.tar.bz2 |
Convert app_bindings.js to the schema_generated_bindings.js infrastructure.
This involves opening up *all* custom bindings to web pages, where access is
controlled content-script style using a URL-matches property in the API schema.
BUG=104100,117282
TEST=unit_tests,browser_tests
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=125811
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=127391
Review URL: http://codereview.chromium.org/9460002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/chrome_render_view_host_observer.cc')
-rw-r--r-- | chrome/browser/renderer_host/chrome_render_view_host_observer.cc | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc index 91da264..67a9acb 100644 --- a/chrome/browser/renderer_host/chrome_render_view_host_observer.cc +++ b/chrome/browser/renderer_host/chrome_render_view_host_observer.cc @@ -104,7 +104,6 @@ void ChromeRenderViewHostObserver::InitRenderViewForExtensions() { content::RenderProcessHost* process = render_view_host()->GetProcess(); if (extension->is_app()) { - Send(new ExtensionMsg_ActivateApplication(extension->id())); // Though we already record the associated process ID for the renderer in // InitRenderViewHostForExtensions, the process might have crashed and been // restarted (hence the re-initialization), so we need to update that @@ -127,13 +126,21 @@ void ChromeRenderViewHostObserver::InitRenderViewForExtensions() { } } - if (type == Extension::TYPE_EXTENSION || - type == Extension::TYPE_USER_SCRIPT || - type == Extension::TYPE_PACKAGED_APP || - type == Extension::TYPE_PLATFORM_APP || - (type == Extension::TYPE_HOSTED_APP && - extension->location() == Extension::COMPONENT)) { - Send(new ExtensionMsg_ActivateExtension(extension->id())); + switch (type) { + case Extension::TYPE_EXTENSION: + case Extension::TYPE_USER_SCRIPT: + case Extension::TYPE_HOSTED_APP: + case Extension::TYPE_PACKAGED_APP: + case Extension::TYPE_PLATFORM_APP: + Send(new ExtensionMsg_ActivateExtension(extension->id())); + break; + + case Extension::TYPE_UNKNOWN: + case Extension::TYPE_THEME: + break; + + default: + NOTREACHED(); } } |