diff options
Diffstat (limited to 'chrome/browser/ui/webui/ntp/ntp_resource_cache.cc')
| -rw-r--r-- | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index cdd8730..0ae524b 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -49,7 +49,6 @@ #include "grit/theme_resources.h" #include "ui/base/animation/animation.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/gfx/color_utils.h" @@ -267,7 +266,7 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() { static const base::StringPiece incognito_tab_html( ResourceBundle::GetSharedInstance().GetRawDataResource( - new_tab_html_idr, ui::SCALE_FACTOR_NONE)); + new_tab_html_idr)); std::string full_html = jstemplate_builder::GetI18nTemplateHtml( incognito_tab_html, &localized_strings); @@ -425,8 +424,7 @@ void NTPResourceCache::CreateNewTabHTML() { // Load the new tab page appropriate for this build base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance(). GetRawDataResource(chrome::search::IsInstantExtendedAPIEnabled(profile_) ? - IDR_NEW_TAB_SEARCH_HTML : IDR_NEW_TAB_4_HTML, - ui::SCALE_FACTOR_NONE)); + IDR_NEW_TAB_SEARCH_HTML : IDR_NEW_TAB_4_HTML)); jstemplate_builder::UseVersion2 version2; std::string full_html = jstemplate_builder::GetI18nTemplateHtml(new_tab_html, &load_time_data); @@ -457,7 +455,7 @@ void NTPResourceCache::CreateNewTabIncognitoCSS() { // Get our template. static const base::StringPiece new_tab_theme_css( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_NEW_INCOGNITO_TAB_THEME_CSS, ui::SCALE_FACTOR_NONE)); + IDR_NEW_INCOGNITO_TAB_THEME_CSS)); // Create the string from our template and the replacements. std::string full_css = ReplaceStringPlaceholders( @@ -553,8 +551,7 @@ void NTPResourceCache::CreateNewTabCSS() { static const base::StringPiece new_tab_theme_css( ResourceBundle::GetSharedInstance().GetRawDataResource( chrome::search::IsInstantExtendedAPIEnabled(profile_) ? - IDR_NEW_TAB_SEARCH_THEME_CSS : IDR_NEW_TAB_4_THEME_CSS, - ui::SCALE_FACTOR_NONE)); + IDR_NEW_TAB_SEARCH_THEME_CSS : IDR_NEW_TAB_4_THEME_CSS)); // Create the string from our template and the replacements. std::string css_string; |