Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6198)

Unified Diff: chrome/browser/renderer_host/chrome_render_view_host_observer.cc

Issue 9460002: Convert app_bindings.js to the schema_generated_bindings.js infrastructure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make test extension ID tests pass Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/chrome_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/chrome_render_view_host_observer.cc
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 91da264e0ab545f3eb2f1a97974b80e51963fef4..67a9acb4a01a1fb44efc768818c799ddcb4b04d4 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();
}
}
« no previous file with comments | « no previous file | chrome/chrome_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698