From bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f Mon Sep 17 00:00:00 2001 From: "flackr@chromium.org" Date: Thu, 17 May 2012 21:05:40 +0000 Subject: Select theme resources from ResourceBundle at requested scale factor. Return the best match for a requested scale factor when fetching raw image data from ResourceBundle. TBR=aa,abodenha BUG=123611 TEST=ResourceBundle.LoadImageResourceBytes Review URL: https://chromiumcodereview.appspot.com/10387010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137734 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/web_apps.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'chrome/common/web_apps.cc') diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc index bfcf199..1564754 100644 --- a/chrome/common/web_apps.cc +++ b/chrome/common/web_apps.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -25,6 +25,7 @@ #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" @@ -216,7 +217,8 @@ bool ParseWebAppFromDefinitionFile(Value* definition_value, scoped_ptr schema( base::JSONReader::ReadAndReturnError( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_WEB_APP_SCHEMA).as_string(), + IDR_WEB_APP_SCHEMA, + ui::SCALE_FACTOR_NONE).as_string(), base::JSON_PARSE_RFC, // options &error_code, &error_message)); -- cgit v1.1