diff options
| author | mitchellwrosen@chromium.org <mitchellwrosen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-02 04:40:32 +0000 |
|---|---|---|
| committer | mitchellwrosen@chromium.org <mitchellwrosen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-02 04:40:32 +0000 |
| commit | 0bf68e2197b41abd19b4b58910a4a81d72b82023 (patch) | |
| tree | 19487707e3cd492428853cbb7d3fa9bd3993d876 /chrome/common/web_apps.cc | |
| parent | 97bdb2fe0a7dac64b534a255675943f0e6f96cdf (diff) | |
| download | chromium_src-0bf68e2197b41abd19b4b58910a4a81d72b82023.zip chromium_src-0bf68e2197b41abd19b4b58910a4a81d72b82023.tar.gz chromium_src-0bf68e2197b41abd19b4b58910a4a81d72b82023.tar.bz2 | |
Update JSONReader to take base::StringPiece instead of std::string
I also went through the source tree and fixed any now-unnecessary conversions
from base::StringPiece to std::string
BUG=114785
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/10003001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/web_apps.cc')
| -rw-r--r-- | chrome/common/web_apps.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc index 1564754..8a2cdcc 100644 --- a/chrome/common/web_apps.cc +++ b/chrome/common/web_apps.cc @@ -218,7 +218,7 @@ bool ParseWebAppFromDefinitionFile(Value* definition_value, base::JSONReader::ReadAndReturnError( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_WEB_APP_SCHEMA, - ui::SCALE_FACTOR_NONE).as_string(), + ui::SCALE_FACTOR_NONE), base::JSON_PARSE_RFC, // options &error_code, &error_message)); |