diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:32:54 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:32:54 +0000 |
| commit | 89a6d31c96f2d54a6b985e9aa9913e20836d1e4d (patch) | |
| tree | 6fe013975a64dc1570d455e94d9ffc8153c9dda5 /chrome/common/web_apps.cc | |
| parent | c10baf7109f37d519f2500d4c4ba8206b7deee07 (diff) | |
| download | chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.zip chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.tar.gz chromium_src-89a6d31c96f2d54a6b985e9aa9913e20836d1e4d.tar.bz2 | |
Add method to load resources without scale
This removes a lot of necessary reference to SCALE_FACTOR_NONE, and eliminate layout.h
I'll cleanup ContentClient in separate CL.
BUG=156569
TEST=none. no functional change.
Review URL: https://chromiumcodereview.appspot.com/11341003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/web_apps.cc')
| -rw-r--r-- | chrome/common/web_apps.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc index a2d1d7e..a0eb1aa 100644 --- a/chrome/common/web_apps.cc +++ b/chrome/common/web_apps.cc @@ -25,7 +25,6 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/size.h" #include "webkit/glue/dom_operations.h" @@ -218,8 +217,7 @@ bool ParseWebAppFromDefinitionFile(Value* definition_value, scoped_ptr<Value> schema( base::JSONReader::ReadAndReturnError( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_WEB_APP_SCHEMA, - ui::SCALE_FACTOR_NONE), + IDR_WEB_APP_SCHEMA), base::JSON_PARSE_RFC, // options &error_code, &error_message)); |