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

Unified Diff: chrome/browser/extensions/crx_installer.cc

Issue 308003005: app_list: Drive app integration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move to c/b/apps, add OWNERS Created 6 years, 6 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
Index: chrome/browser/extensions/crx_installer.cc
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index b77769ff455590584b3e6232c284f5dacda26f6b..ccdf04356b4d7dff8edb661f386898095aa125eb 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -229,21 +229,25 @@ void CrxInstaller::ConvertUserScriptOnFileThread() {
void CrxInstaller::InstallWebApp(const WebApplicationInfo& web_app) {
NotifyCrxInstallBegin();
+ const int creation_flags = creation_flags_ == Extension::NO_FLAGS
+ ? Extension::FROM_BOOKMARK
not at google - send to devlin 2014/06/05 16:54:05 what does this mean?
xiyuan 2014/06/05 17:06:19 This is to keep the current behavior, where Extens
not at google - send to devlin 2014/06/05 17:17:58 Yes I would prefer that. DCHECK if you wish.
xiyuan 2014/06/05 17:48:32 Done. Two callers: BookmarkAppHelper and AppLaunch
+ : 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.";

Powered by Google App Engine
This is Rietveld 408576698