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

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

Issue 11198067: Move extension unpack intermediate dir to Extensions/Temp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: standardize names Created 8 years, 2 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 | « chrome/browser/extensions/crx_installer.h ('k') | chrome/browser/extensions/sandboxed_unpacker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/crx_installer.cc
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 8106e8e679747d85221b0febdc3efa521e22afa6..71d94e8594931612d88021177eb18021b0372b66 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -158,6 +158,7 @@ void CrxInstaller::InstallCrx(const FilePath& source_file) {
content::ResourceDispatcherHost::Get() != NULL,
install_source_,
creation_flags_,
+ install_directory_,
this));
if (!BrowserThread::PostTask(
@@ -182,7 +183,7 @@ void CrxInstaller::InstallUserScript(const FilePath& source_file,
void CrxInstaller::ConvertUserScriptOnFileThread() {
string16 error;
scoped_refptr<Extension> extension = ConvertUserScriptToExtension(
- source_file_, download_url_, &error);
+ source_file_, download_url_, install_directory_, &error);
if (!extension) {
ReportFailureFromFileThread(CrxInstallerError(error));
return;
@@ -194,15 +195,18 @@ void CrxInstaller::ConvertUserScriptOnFileThread() {
void CrxInstaller::InstallWebApp(const WebApplicationInfo& web_app) {
if (!BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
- base::Bind(&CrxInstaller::ConvertWebAppOnFileThread, this, web_app)))
+ base::Bind(&CrxInstaller::ConvertWebAppOnFileThread,
+ this,
+ web_app,
+ install_directory_)))
NOTREACHED();
}
void CrxInstaller::ConvertWebAppOnFileThread(
- const WebApplicationInfo& web_app) {
+ const WebApplicationInfo& web_app, const FilePath& install_directory) {
string16 error;
scoped_refptr<Extension> extension(
- ConvertWebAppToExtension(web_app, base::Time::Now()));
+ ConvertWebAppToExtension(web_app, base::Time::Now(), install_directory));
if (!extension) {
// Validation should have stopped any potential errors before getting here.
NOTREACHED() << "Could not convert web app to extension.";
« no previous file with comments | « chrome/browser/extensions/crx_installer.h ('k') | chrome/browser/extensions/sandboxed_unpacker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698