Select theme resources from ResourceBundle at requested scale factor.

chrome/common/web_apps.cc

-// 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.
 
 #include "chrome/common/web_apps.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/json_schema_validator.h"
 #include "googleurl/src/gurl.h"
 #include "grit/common_resources.h"
 #include "grit/generated_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h"
 #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"
 
 using WebKit::WebDocument;
 using WebKit::WebElement;
 using WebKit::WebFrame;
 using WebKit::WebNode;
 using WebKit::WebNodeList;
 using WebKit::WebString;
@@ skipping 171 matching lines @@
 bool ParseWebAppFromDefinitionFile(Value* definition_value,
                                    WebApplicationInfo* web_app,
                                    string16* error) {
   DCHECK(web_app->manifest_url.is_valid());
 
   int error_code = 0;
   std::string error_message;
   scoped_ptr<Value> 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));
   DCHECK(schema.get())
       << "Error parsing JSON schema: " << error_code << ": " << error_message;
   DCHECK(schema->IsType(Value::TYPE_DICTIONARY))
       << "schema root must be dictionary.";
 
   JSONSchemaValidator validator(static_cast<DictionaryValue*>(schema.get()));
 
@@ skipping 90 matching lines @@
   web_app->app_url = app_url;
   web_app->urls = urls;
   web_app->permissions = permissions;
   web_app->icons = icons;
 
   return true;
 
 }
 
 }  // namespace web_apps