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

Unified Diff: chrome/common/net/net_resource_provider.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. 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
Index: chrome/common/net/net_resource_provider.cc
diff --git a/chrome/common/net/net_resource_provider.cc b/chrome/common/net/net_resource_provider.cc
index abea5f40efe5638964d10df19e0611280e0c4b5e..db1a8ba1f75867e78a52cc1f05c044b28a14bbca 100644
--- a/chrome/common/net/net_resource_provider.cc
+++ b/chrome/common/net/net_resource_provider.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.
@@ -13,6 +13,7 @@
#include "grit/generated_resources.h"
#include "grit/net_resources.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
namespace {
@@ -40,7 +41,7 @@ struct LazyDirectoryListerCacher {
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
html_data = jstemplate_builder::GetI18nTemplateHtml(
ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_DIR_HEADER_HTML),
+ IDR_DIR_HEADER_HTML, ui::SCALE_FACTOR_NONE),
&value);
}
@@ -57,7 +58,8 @@ base::StringPiece NetResourceProvider(int key) {
if (IDR_DIR_HEADER_HTML == key)
return base::StringPiece(lazy_dir_lister.html_data);
- return ResourceBundle::GetSharedInstance().GetRawDataResource(key);
+ return ResourceBundle::GetSharedInstance().GetRawDataResource(
+ key, ui::SCALE_FACTOR_NONE);
}
} // namespace chrome_common_net

Powered by Google App Engine
This is Rietveld 408576698