Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1061)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/web_apps.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Convert ptr to bool for win compile. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/offline/offline_load_page.cc ('K') | « chrome/common/net/net_resource_provider.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | ui/base/resource/data_pack.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/web_apps.cc
diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc
index bfcf19945203486cfb8604ba673b4f3ec06576b9..f49b289df42ebf39932bdb108f1dc1ee32067c5d 100644
--- a/chrome/common/web_apps.cc
+++ b/chrome/common/web_apps.cc
@@ -26,6 +26,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/resource/resource_handle.h"
#include "ui/gfx/size.h"
#include "webkit/glue/dom_operations.h"
@@ -216,7 +217,8 @@ bool ParseWebAppFromDefinitionFile(Value* definition_value,
scoped_ptr<Value> schema(
base::JSONReader::ReadAndReturnError(
ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_WEB_APP_SCHEMA).as_string(),
+ IDR_WEB_APP_SCHEMA,
+ ui::ResourceHandle::kScaleFactorNone).as_string(),
base::JSON_PARSE_RFC, // options
&error_code,
&error_message));
« chrome/browser/chromeos/offline/offline_load_page.cc ('K') | « chrome/common/net/net_resource_provider.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | ui/base/resource/data_pack.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698