diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 04:00:57 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 04:00:57 +0000 |
| commit | a65175d452e6cb3c9c3599ab4206c42b8ab78bfd (patch) | |
| tree | ae69bde6df9080e4e367c23bba9096a1bf302c60 /chrome/browser/extensions | |
| parent | d9e0c26a9c2850d42c4de6b2f981a8da56497c2c (diff) | |
| download | chromium_src-a65175d452e6cb3c9c3599ab4206c42b8ab78bfd.zip chromium_src-a65175d452e6cb3c9c3599ab4206c42b8ab78bfd.tar.gz chromium_src-a65175d452e6cb3c9c3599ab4206c42b8ab78bfd.tar.bz2 | |
Remove deprecated wstring DictionaryValue Get{Boolean,Integer,Real,Binary,Dictionary,List}().
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3187004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_dom_ui.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_prefs.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/external_pref_extension_provider.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_dom_ui.cc b/chrome/browser/extensions/extension_dom_ui.cc index 29768b9..a6b6fc6 100644 --- a/chrome/browser/extensions/extension_dom_ui.cc +++ b/chrome/browser/extensions/extension_dom_ui.cc @@ -225,7 +225,7 @@ bool ExtensionDOMUI::HandleChromeURLOverride(GURL* url, Profile* profile) { profile->GetPrefs()->GetDictionary(kExtensionURLOverrides); std::string page = url->host(); ListValue* url_list; - if (!overrides || !overrides->GetList(UTF8ToWide(page), &url_list)) + if (!overrides || !overrides->GetList(page, &url_list)) return false; ExtensionsService* service = profile->GetExtensionsService(); @@ -348,7 +348,7 @@ void ExtensionDOMUI::UnregisterChromeURLOverride(const std::string& page, DictionaryValue* all_overrides = prefs->GetMutableDictionary(kExtensionURLOverrides); ListValue* page_overrides; - if (!all_overrides->GetList(UTF8ToWide(page), &page_overrides)) { + if (!all_overrides->GetList(page, &page_overrides)) { // If it's being unregistered, it should already be in the list. NOTREACHED(); return; diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index c33ea33..9b28456 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -222,7 +222,7 @@ bool ExtensionPrefs::ReadExtensionPrefBoolean( return false; DictionaryValue* ext = NULL; - if (!extensions->GetDictionary(ASCIIToWide(extension_id), &ext)) { + if (!extensions->GetDictionary(extension_id, &ext)) { // No such extension yet. return false; } diff --git a/chrome/browser/extensions/external_pref_extension_provider.cc b/chrome/browser/extensions/external_pref_extension_provider.cc index 8bcd891..d9b2748 100644 --- a/chrome/browser/extensions/external_pref_extension_provider.cc +++ b/chrome/browser/extensions/external_pref_extension_provider.cc @@ -86,7 +86,7 @@ void ExternalPrefExtensionProvider::VisitRegisteredExtension( Version* ExternalPrefExtensionProvider::RegisteredVersion( const std::string& id, Extension::Location* location) const { DictionaryValue* extension = NULL; - if (!prefs_->GetDictionary(ASCIIToWide(id), &extension)) + if (!prefs_->GetDictionary(id, &extension)) return NULL; std::string external_version; |