diff options
author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:15:03 +0000 |
---|---|---|
committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 19:15:03 +0000 |
commit | f3a1c64a4d81c412273ed567536f23c2c14813a2 (patch) | |
tree | f0ced21805b18546e879413e4f808dd4f683c534 /chrome/browser/extensions/sandboxed_extension_unpacker.h | |
parent | 2338319a9acbaecba44243740b3f01b5c408a78a (diff) | |
download | chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.zip chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.gz chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.bz2 |
Move base/values.h into the base namespace. This includes a cros DEPS roll
with a minor change to that code since libcros also uses base/values.h.
BUG=88666
TEST=none
Review URL: http://codereview.chromium.org/7259019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/sandboxed_extension_unpacker.h')
-rw-r--r-- | chrome/browser/extensions/sandboxed_extension_unpacker.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.h b/chrome/browser/extensions/sandboxed_extension_unpacker.h index 4bb7e74..6204876 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.h +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.h @@ -13,10 +13,13 @@ #include "base/scoped_temp_dir.h" #include "content/browser/utility_process_host.h" -class DictionaryValue; class Extension; class ResourceDispatcherHost; +namespace base { +class DictionaryValue; +} + class SandboxedExtensionUnpackerClient : public base::RefCountedThreadSafe<SandboxedExtensionUnpackerClient> { public: @@ -32,7 +35,7 @@ class SandboxedExtensionUnpackerClient // for deleting this memory. virtual void OnUnpackSuccess(const FilePath& temp_dir, const FilePath& extension_root, - const DictionaryValue* original_manifest, + const base::DictionaryValue* original_manifest, const Extension* extension) = 0; virtual void OnUnpackFailure(const std::string& error) = 0; @@ -192,15 +195,16 @@ class SandboxedExtensionUnpacker : public UtilityProcessHost::Client { virtual void OnProcessCrashed(int exit_code); // IPC message handlers. - void OnUnpackExtensionSucceeded(const DictionaryValue& manifest); + void OnUnpackExtensionSucceeded(const base::DictionaryValue& manifest); void OnUnpackExtensionFailed(const std::string& error_message); void ReportFailure(FailureReason reason, const std::string& message); - void ReportSuccess(const DictionaryValue& original_manifest); + void ReportSuccess(const base::DictionaryValue& original_manifest); // Overwrites original manifest with safe result from utility process. // Returns NULL on error. Caller owns the returned object. - DictionaryValue* RewriteManifestFile(const DictionaryValue& manifest); + base::DictionaryValue* RewriteManifestFile( + const base::DictionaryValue& manifest); // Overwrites original files with safe results from utility process. // Reports error and returns false if it fails. |