From 66d6d400d539f526671920968970d02c03f70148 Mon Sep 17 00:00:00 2001 From: "rafaelw@chromium.org" Date: Wed, 7 Oct 2009 22:26:07 +0000 Subject: Reland: HTML Pack Extension Dialog / Linux & Mac Packaging Support. Part 1. original issue: http://codereview.chromium.org/207062 Attempting to land this patch earlier resulted in compile failures on linux valgrind and linux perf that I was unable to reproduce. I am splitting this into two pieces. This piece adds extension packing support via --pack-extension for mac & linux. BUG=20668,20669 Review URL: http://codereview.chromium.org/266007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28325 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extensions_service_unittest.cc | 2 -- chrome/browser/extensions/pack_extension_job.h | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'chrome/browser/extensions') diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc index fa257e0..57ae6f6 100644 --- a/chrome/browser/extensions/extensions_service_unittest.cc +++ b/chrome/browser/extensions/extensions_service_unittest.cc @@ -727,7 +727,6 @@ TEST_F(ExtensionsServiceTest, InstallExtension) { // TODO(erikkay): add tests for upgrade cases. } -#if defined(OS_WIN) // TODO(port) // Test Packaging and installing an extension. // TODO(rafaelw): add more tests for failure cases. TEST_F(ExtensionsServiceTest, PackExtension) { @@ -791,7 +790,6 @@ TEST_F(ExtensionsServiceTest, PackExtensionOpenSSLKey) { file_util::Delete(crx_path, false); } -#endif // defined(OS_WIN) TEST_F(ExtensionsServiceTest, InstallTheme) { InitializeEmptyExtensionsService(); diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h index ec00f21..8c3cf26 100644 --- a/chrome/browser/extensions/pack_extension_job.h +++ b/chrome/browser/extensions/pack_extension_job.h @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#ifndef CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_UI_H_ +#define CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_UI_H_ + #include #include "base/file_path.h" @@ -11,7 +14,7 @@ class MessageLoop; // Manages packing an extension on the file thread and reporting the result // back to the UI. -class PackExtensionJob : public base::RefCounted { +class PackExtensionJob : public base::RefCountedThreadSafe { public: // Interface for people who want to use PackExtensionJob to implement. @@ -46,3 +49,6 @@ class PackExtensionJob : public base::RefCounted { DISALLOW_COPY_AND_ASSIGN(PackExtensionJob); }; + +#endif // CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_UI_H_ + -- cgit v1.1