diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 21:12:40 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 21:12:40 +0000 |
| commit | 4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5 (patch) | |
| tree | e8e59794adf98f2de8f00299eb3c46fa40c94f02 /chrome/browser/ui/webui/ntp/ntp_resource_cache.cc | |
| parent | 9c55de8ff9f0f0f4dc907794266e7bbb21e75b66 (diff) | |
| download | chromium_src-4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5.zip chromium_src-4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5.tar.gz chromium_src-4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5.tar.bz2 | |
Add method to load resources without scale
This removes a lot of necessary reference to SCALE_FACTOR_NONE, and eliminate layout.h
I'll cleanup ContentClient in separate CL.
BUG=156569
TEST=none. no functional change.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=165444
Review URL: https://chromiumcodereview.appspot.com/11341003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165500 0039d316-1c4b-4281-b951-d872f2087c98
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; |