| Index: chrome/browser/extensions/crx_installer.cc
|
| diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
|
| index d03bc1c59978c51ff53d3faca42e9b52ebdfd55c..fb26e50a6b1bd22ea40167cbae4e7c1d4d85407b 100644
|
| --- a/chrome/browser/extensions/crx_installer.cc
|
| +++ b/chrome/browser/extensions/crx_installer.cc
|
| @@ -228,21 +228,25 @@ void CrxInstaller::ConvertUserScriptOnFileThread() {
|
| void CrxInstaller::InstallWebApp(const WebApplicationInfo& web_app) {
|
| NotifyCrxInstallBegin();
|
|
|
| + const int creation_flags = creation_flags_ == Extension::NO_FLAGS
|
| + ? Extension::FROM_BOOKMARK
|
| + : creation_flags_;
|
| if (!installer_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&CrxInstaller::ConvertWebAppOnFileThread,
|
| this,
|
| web_app,
|
| + creation_flags,
|
| install_directory_)))
|
| NOTREACHED();
|
| }
|
|
|
| void CrxInstaller::ConvertWebAppOnFileThread(
|
| const WebApplicationInfo& web_app,
|
| + int creation_flags,
|
| const base::FilePath& install_directory) {
|
| - base::string16 error;
|
| - scoped_refptr<Extension> extension(
|
| - ConvertWebAppToExtension(web_app, base::Time::Now(), install_directory));
|
| + scoped_refptr<Extension> extension(ConvertWebAppToExtension(
|
| + web_app, base::Time::Now(), creation_flags, install_directory));
|
| if (!extension.get()) {
|
| // Validation should have stopped any potential errors before getting here.
|
| NOTREACHED() << "Could not convert web app to extension.";
|
|
|