diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 22:08:37 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 22:08:37 +0000 |
| commit | 883fd6284db5ba9abe08b8433c8efabe18af139f (patch) | |
| tree | 194fa57f433ccafe5cdb6bd2a91e057f3c2911ed /chrome/browser/extensions/extension.cc | |
| parent | a0810b268b459d6d451882123ad12513dafb11f1 (diff) | |
| download | chromium_src-883fd6284db5ba9abe08b8433c8efabe18af139f.zip chromium_src-883fd6284db5ba9abe08b8433c8efabe18af139f.tar.gz chromium_src-883fd6284db5ba9abe08b8433c8efabe18af139f.tar.bz2 | |
Reverting 11294.
Review URL: http://codereview.chromium.org/40321
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension.cc')
| -rw-r--r-- | chrome/browser/extensions/extension.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/chrome/browser/extensions/extension.cc b/chrome/browser/extensions/extension.cc index 437169d..d83f9d9 100644 --- a/chrome/browser/extensions/extension.cc +++ b/chrome/browser/extensions/extension.cc @@ -26,7 +26,6 @@ const wchar_t* Extension::kVersionKey = L"version"; const wchar_t* Extension::kZipHashKey = L"zip_hash"; const wchar_t* Extension::kPluginsDirKey = L"plugins_dir"; const wchar_t* Extension::kThemeKey = L"theme"; -const wchar_t* Extension::kToolstripKey = L"toolstrip"; const char* Extension::kRunAtDocumentStartValue = "document_start"; const char* Extension::kRunAtDocumentEndValue = "document_end"; @@ -71,8 +70,6 @@ const char* Extension::kInvalidZipHashError = "Required key 'zip_hash' is missing or invalid."; const char* Extension::kInvalidPluginsDirError = "Invalid value for 'plugins_dir'."; -const char* Extension::kInvalidToolstripError = - "Invalid value for 'toolstrip'."; const size_t Extension::kIdSize = 20; // SHA1 (160 bits) == 20 bytes @@ -263,16 +260,6 @@ bool Extension::InitFromValue(const DictionaryValue& source, plugins_dir_ = path_.AppendASCII(plugins_dir); } - // Initialize toolstrip (optional). - if (source.HasKey(kToolstripKey)) { - std::string toolstrip_path; - if (!source.GetString(kToolstripKey, &toolstrip_path)) { - *error = kInvalidToolstripError; - return false; - } - toolstrip_url_ = GetResourceURL(extension_url_, toolstrip_path); - } - if (source.HasKey(kThemeKey)) { DictionaryValue* dict_value; if (source.GetDictionary(kThemeKey, &dict_value)) { |