diff options
13 files changed, 47 insertions, 25 deletions
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index c0e9422..2c1532b 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -37,6 +37,7 @@ #include "content/public/browser/render_view_host.h" using extensions::Extension; +using extensions::ExtensionCreator; ExtensionBrowserTest::ExtensionBrowserTest() : loaded_(false), diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index 0fbfd05..7c24389 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -23,12 +23,12 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -using extensions::Extension; - namespace { const int kRSAKeySize = 1024; }; +namespace extensions { + ExtensionCreator::ExtensionCreator() : error_type_(kOtherError) { } @@ -317,3 +317,5 @@ bool ExtensionCreator::Run(const FilePath& extension_dir, file_util::Delete(zip_path, false); return result; } + +} // namespace extensions diff --git a/chrome/browser/extensions/extension_creator.h b/chrome/browser/extensions/extension_creator.h index 71d5091..48d5233 100644 --- a/chrome/browser/extensions/extension_creator.h +++ b/chrome/browser/extensions/extension_creator.h @@ -17,6 +17,8 @@ class RSAPrivateKey; class FilePath; +namespace extensions { + // This class create an installable extension (.crx file) given an input // directory that contains a valid manifest.json and the extension's resources // contained within that directory. The output .crx file is always signed with a @@ -95,4 +97,6 @@ class ExtensionCreator { DISALLOW_COPY_AND_ASSIGN(ExtensionCreator); }; +} // namespace extensions + #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_CREATOR_H_ diff --git a/chrome/browser/extensions/extension_creator_filter.cc b/chrome/browser/extensions/extension_creator_filter.cc index 7708ef2..fdca45a 100644 --- a/chrome/browser/extensions/extension_creator_filter.cc +++ b/chrome/browser/extensions/extension_creator_filter.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,6 +10,8 @@ #include <windows.h> #endif +namespace extensions { + bool ExtensionCreatorFilter::ShouldPackageFile(const FilePath& file_path) { const FilePath& base_name = file_path.BaseName(); if (base_name.empty()) { @@ -51,3 +53,5 @@ bool ExtensionCreatorFilter::ShouldPackageFile(const FilePath& file_path) { return true; } + +} // namespace extensions diff --git a/chrome/browser/extensions/extension_creator_filter.h b/chrome/browser/extensions/extension_creator_filter.h index 21bf50b..a896ab3 100644 --- a/chrome/browser/extensions/extension_creator_filter.h +++ b/chrome/browser/extensions/extension_creator_filter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,6 +10,8 @@ class FilePath; +namespace extensions { + // Determines which files should be included in a packaged extension. // Designed specifically to operate with the callback in chrome/common/zip. class ExtensionCreatorFilter @@ -27,4 +29,6 @@ class ExtensionCreatorFilter DISALLOW_COPY_AND_ASSIGN(ExtensionCreatorFilter); }; +} // namespace etensions + #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_CREATOR_FILTER_H_ diff --git a/chrome/browser/extensions/extension_creator_filter_unittest.cc b/chrome/browser/extensions/extension_creator_filter_unittest.cc index 9ff25d4..59e624b 100644 --- a/chrome/browser/extensions/extension_creator_filter_unittest.cc +++ b/chrome/browser/extensions/extension_creator_filter_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,7 +19,7 @@ class ExtensionCreatorFilterTest : public PlatformTest { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); test_dir_ = temp_dir_.path(); - filter_ = new ExtensionCreatorFilter(); + filter_ = new extensions::ExtensionCreatorFilter(); } FilePath CreateEmptyTestFile(const FilePath& file_path) { @@ -30,7 +30,7 @@ class ExtensionCreatorFilterTest : public PlatformTest { return test_file; } - scoped_refptr<ExtensionCreatorFilter> filter_; + scoped_refptr<extensions::ExtensionCreatorFilter> filter_; ScopedTempDir temp_dir_; diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index c48090a..eada4ca 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -99,6 +99,7 @@ using content::PluginService; using extensions::APIPermission; using extensions::APIPermissionSet; using extensions::Extension; +using extensions::ExtensionCreator; using extensions::ExtensionPrefs; using extensions::PermissionSet; diff --git a/chrome/browser/extensions/extensions_startup.cc b/chrome/browser/extensions/extensions_startup.cc index 94caf2e..cd11840 100644 --- a/chrome/browser/extensions/extensions_startup.cc +++ b/chrome/browser/extensions/extensions_startup.cc @@ -24,8 +24,9 @@ void ExtensionsStartupUtil::OnPackSuccess( chrome::MESSAGE_BOX_TYPE_INFORMATION); } -void ExtensionsStartupUtil::OnPackFailure(const std::string& error_message, - ExtensionCreator::ErrorType type) { +void ExtensionsStartupUtil::OnPackFailure( + const std::string& error_message, + extensions::ExtensionCreator::ErrorType type) { chrome::ShowMessageBox(NULL, ASCIIToUTF16("Extension Packaging Error"), UTF8ToUTF16(error_message), chrome::MESSAGE_BOX_TYPE_WARNING); } @@ -44,7 +45,7 @@ bool ExtensionsStartupUtil::PackExtension(const CommandLine& cmd_line) { // Launch a job to perform the packing on the file thread. Ignore warnings // from the packing process. (e.g. Overwrite any existing crx file.) pack_job_ = new PackExtensionJob(this, src_dir, private_key_path, - ExtensionCreator::kOverwriteCRX); + extensions::ExtensionCreator::kOverwriteCRX); pack_job_->set_asynchronous(false); pack_job_->Start(); diff --git a/chrome/browser/extensions/extensions_startup.h b/chrome/browser/extensions/extensions_startup.h index 91a88fd..450a47b 100644 --- a/chrome/browser/extensions/extensions_startup.h +++ b/chrome/browser/extensions/extensions_startup.h @@ -20,8 +20,9 @@ class ExtensionsStartupUtil : public PackExtensionJob::Client { virtual void OnPackSuccess(const FilePath& crx_path, const FilePath& output_private_key_path) OVERRIDE; - virtual void OnPackFailure(const std::string& error_message, - ExtensionCreator::ErrorType type) OVERRIDE; + virtual void OnPackFailure( + const std::string& error_message, + extensions::ExtensionCreator::ErrorType type) OVERRIDE; // Handle --pack-extension flag from the |cmd_line| by packing the specified // extension. Returns false if the pack job failed. diff --git a/chrome/browser/extensions/pack_extension_job.cc b/chrome/browser/extensions/pack_extension_job.cc index 93152a7..ac54f97 100644 --- a/chrome/browser/extensions/pack_extension_job.cc +++ b/chrome/browser/extensions/pack_extension_job.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -51,7 +51,7 @@ void PackExtensionJob::Run() { // TODO(aa): Need to internationalize the errors that ExtensionCreator // returns. See bug 20734. - ExtensionCreator creator; + extensions::ExtensionCreator creator; if (creator.Run(root_directory_, crx_file_out_, key_file_, key_file_out_, run_flags_)) { if (asynchronous_) { @@ -82,7 +82,7 @@ void PackExtensionJob::ReportSuccessOnClientThread() { void PackExtensionJob::ReportFailureOnClientThread( const std::string& error, - ExtensionCreator::ErrorType error_type) { + extensions::ExtensionCreator::ErrorType error_type) { if (client_) client_->OnPackFailure(error, error_type); } diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h index f6b99d7..0a6d795 100644 --- a/chrome/browser/extensions/pack_extension_job.h +++ b/chrome/browser/extensions/pack_extension_job.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -24,8 +24,9 @@ class PackExtensionJob : public base::RefCountedThreadSafe<PackExtensionJob> { public: virtual void OnPackSuccess(const FilePath& crx_file, const FilePath& key_file) = 0; - virtual void OnPackFailure(const std::string& message, - ExtensionCreator::ErrorType error_type) = 0; + virtual void OnPackFailure( + const std::string& message, + extensions::ExtensionCreator::ErrorType error_type) = 0; protected: virtual ~Client() {} @@ -57,8 +58,9 @@ class PackExtensionJob : public base::RefCountedThreadSafe<PackExtensionJob> { // If |asynchronous_| is false, this is run on whichever thread calls it. void Run(); void ReportSuccessOnClientThread(); - void ReportFailureOnClientThread(const std::string& error, - ExtensionCreator::ErrorType error_type); + void ReportFailureOnClientThread( + const std::string& error, + extensions::ExtensionCreator::ErrorType error_type); content::BrowserThread::ID client_thread_id_; Client* client_; diff --git a/chrome/browser/ui/webui/extensions/pack_extension_handler.cc b/chrome/browser/ui/webui/extensions/pack_extension_handler.cc index d97814f..d4a8000 100644 --- a/chrome/browser/ui/webui/extensions/pack_extension_handler.cc +++ b/chrome/browser/ui/webui/extensions/pack_extension_handler.cc @@ -75,13 +75,15 @@ void PackExtensionHandler::OnPackSuccess(const FilePath& crx_file, "PackExtensionOverlay.showSuccessMessage", arguments); } -void PackExtensionHandler::OnPackFailure(const std::string& error, - ExtensionCreator::ErrorType type) { - if (type == ExtensionCreator::kCRXExists) { +void PackExtensionHandler::OnPackFailure( + const std::string& error, + extensions::ExtensionCreator::ErrorType type) { + if (type == extensions::ExtensionCreator::kCRXExists) { base::StringValue error_str(error); base::StringValue extension_path_str(extension_path_); base::StringValue key_path_str(private_key_path_); - base::FundamentalValue overwrite_flag(ExtensionCreator::kOverwriteCRX); + base::FundamentalValue overwrite_flag( + extensions::ExtensionCreator::kOverwriteCRX); web_ui()->CallJavascriptFunction( "ExtensionSettings.askToOverrideWarning", error_str, extension_path_str, diff --git a/chrome/browser/ui/webui/extensions/pack_extension_handler.h b/chrome/browser/ui/webui/extensions/pack_extension_handler.h index 40385719..b8b2c95 100644 --- a/chrome/browser/ui/webui/extensions/pack_extension_handler.h +++ b/chrome/browser/ui/webui/extensions/pack_extension_handler.h @@ -32,7 +32,7 @@ class PackExtensionHandler : public content::WebUIMessageHandler, const FilePath& key_file) OVERRIDE; virtual void OnPackFailure(const std::string& error, - ExtensionCreator::ErrorType) OVERRIDE; + extensions::ExtensionCreator::ErrorType) OVERRIDE; private: // SelectFileDialog::Listener implementation. |