diff options
| author | miket@chromium.org <miket@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 02:17:53 +0000 |
|---|---|---|
| committer | miket@chromium.org <miket@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 02:17:53 +0000 |
| commit | 9776e82e6f0c0b011007b12dc5e14b31e30da62b (patch) | |
| tree | f43f2a119f2d3fcb14fe5b890440900b375123a7 /chrome/browser | |
| parent | 4e86b6e1e67ef8cb2ff2770dfe4b7c87d09d85d8 (diff) | |
| download | chromium_src-9776e82e6f0c0b011007b12dc5e14b31e30da62b.zip chromium_src-9776e82e6f0c0b011007b12dc5e14b31e30da62b.tar.gz chromium_src-9776e82e6f0c0b011007b12dc5e14b31e30da62b.tar.bz2 | |
Insert default stylesheet for platform apps.
Review URL: http://codereview.chromium.org/8542001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_service.cc | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index f8398cb..3853866 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -573,6 +573,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kEnableIPCFuzzing, switches::kEnableLazyBackgroundPages, switches::kEnableNaCl, + switches::kEnablePlatformApps, switches::kEnablePrintPreview, switches::kEnableSearchProviderApiV2, switches::kEnableWatchdog, diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index b9d848a..3f77711 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -922,8 +922,10 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) { Profile* host_profile = Profile::FromBrowserContext(host->browser_context()); if (host_profile->GetOriginalProfile() == profile_->GetOriginalProfile()) { + std::vector<ExtensionMsg_Loaded_Params> loaded_extensions( + 1, ExtensionMsg_Loaded_Params(extension)); host->Send( - new ExtensionMsg_Loaded(ExtensionMsg_Loaded_Params(extension))); + new ExtensionMsg_Loaded(loaded_extensions)); } } @@ -2332,10 +2334,12 @@ void ExtensionService::Observe(int type, *Extension::GetScriptingWhitelist())); // Loaded extensions. + std::vector<ExtensionMsg_Loaded_Params> loaded_extensions; for (size_t i = 0; i < extensions_.size(); ++i) { - process->Send(new ExtensionMsg_Loaded( - ExtensionMsg_Loaded_Params(extensions_[i]))); + loaded_extensions.push_back( + ExtensionMsg_Loaded_Params(extensions_[i])); } + process->Send(new ExtensionMsg_Loaded(loaded_extensions)); break; } case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED: { |