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

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: for comemnts in #5 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..21767b884349d2cdeefb5f10e4fc3c1afc5ad7da 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -229,21 +229,23 @@ void CrxInstaller::ConvertUserScriptOnFileThread() {
void CrxInstaller::InstallWebApp(const WebApplicationInfo& web_app) {
NotifyCrxInstallBegin();
+ DCHECK(creation_flags_ & Extension::FROM_BOOKMARK);
not at google - send to devlin 2014/06/05 17:50:45 could you briefly explain why this check is made?
xiyuan 2014/06/05 18:06:53 This is inherited from the current ConvertWebAppTo
not at google - send to devlin 2014/06/05 18:11:54 Yeah, I think that a comment like "Web apps can on
xiyuan 2014/06/05 18:27:35 Done.
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,
not at google - send to devlin 2014/06/05 17:50:45 this shouldn't be necessary, it can be read from c
xiyuan 2014/06/05 18:06:53 I am slightly prefer to have an arg here because i
not at google - send to devlin 2014/06/05 18:11:54 I see your point. It looks like a bunch of this ac
xiyuan 2014/06/05 18:27:35 Right. I might be over-thinking it. :p - Removed
not at google - send to devlin 2014/06/05 18:31:45 ah.
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