| Index: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
|
| diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
|
| index 6114c3b7e4093413e7aba976317a162ad46eff57..b79746118a72630d02ebd6cc40325a71af7f5ef8 100644
|
| --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
|
| +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
|
| @@ -46,6 +46,7 @@
|
| #include "ui/base/animation/animation.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| +#include "ui/base/resource/resource_handle.h"
|
| #include "ui/base/theme_provider.h"
|
| #include "ui/gfx/color_utils.h"
|
| #include "ui/gfx/sys_color_change_listener.h"
|
| @@ -296,7 +297,7 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
|
|
|
| static const base::StringPiece incognito_tab_html(
|
| ResourceBundle::GetSharedInstance().GetRawDataResource(
|
| - new_tab_html_idr));
|
| + new_tab_html_idr, ui::ResourceHandle::kScaleFactorNone));
|
|
|
| std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
|
| incognito_tab_html, &localized_strings);
|
| @@ -447,7 +448,8 @@ void NTPResourceCache::CreateNewTabHTML() {
|
|
|
| // Load the new tab page appropriate for this build
|
| base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
|
| - GetRawDataResource(IDR_NEW_TAB_4_HTML));
|
| + GetRawDataResource(IDR_NEW_TAB_4_HTML,
|
| + ui::ResourceHandle::kScaleFactorNone));
|
| jstemplate_builder::UseVersion2 version2;
|
| std::string full_html =
|
| jstemplate_builder::GetI18nTemplateHtml(new_tab_html, &load_time_data);
|
| @@ -478,7 +480,7 @@ void NTPResourceCache::CreateNewTabIncognitoCSS() {
|
| // Get our template.
|
| static const base::StringPiece new_tab_theme_css(
|
| ResourceBundle::GetSharedInstance().GetRawDataResource(
|
| - IDR_NEW_INCOGNITO_TAB_THEME_CSS));
|
| + IDR_NEW_INCOGNITO_TAB_THEME_CSS, ui::ResourceHandle::kScaleFactorNone));
|
|
|
| // Create the string from our template and the replacements.
|
| std::string full_css = ReplaceStringPlaceholders(
|
| @@ -573,7 +575,7 @@ void NTPResourceCache::CreateNewTabCSS() {
|
| // Get our template.
|
| static const base::StringPiece new_tab_theme_css(
|
| ResourceBundle::GetSharedInstance().GetRawDataResource(
|
| - IDR_NEW_TAB_4_THEME_CSS));
|
| + IDR_NEW_TAB_4_THEME_CSS, ui::ResourceHandle::kScaleFactorNone));
|
|
|
| // Create the string from our template and the replacements.
|
| std::string css_string;
|
|
|