diff options
Diffstat (limited to 'chrome/browser/ui')
28 files changed, 47 insertions, 64 deletions
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc index 776511e..f7af1a9 100644 --- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc +++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc @@ -38,7 +38,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" @@ -194,8 +193,7 @@ class PDFUnsupportedFeatureInterstitial l10n_util::GetStringUTF16(IDS_READER_OUT_OF_DATE_BLOCKING_PAGE_CANCEL)); base::StringPiece html(ResourceBundle::GetSharedInstance(). - GetRawDataResource(IDR_READER_OUT_OF_DATE_HTML, - ui::SCALE_FACTOR_NONE)); + GetRawDataResource(IDR_READER_OUT_OF_DATE_HTML)); return jstemplate_builder::GetI18nTemplateHtml(html, &strings); } diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 7d7fce2..bdbeea1 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -58,7 +58,6 @@ #include "net/base/escape.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #if defined(ENABLE_THEMES) @@ -713,8 +712,7 @@ void FinishMemoryDataRequest(const std::string& path, source->FinishDataRequest( ResourceBundle::GetSharedInstance().GetRawDataResource( path == kMemoryJsPath ? IDR_ABOUT_MEMORY_JS : - IDR_ABOUT_MEMORY_HTML, - ui::SCALE_FACTOR_NONE).as_string(), request_id); + IDR_ABOUT_MEMORY_HTML).as_string(), request_id); } } @@ -865,8 +863,8 @@ std::string AboutStats(const std::string& query) { } else { // Get about_stats.html/js from resource bundle. data = ResourceBundle::GetSharedInstance().GetRawDataResource( - (query == kStatsJsPath ? IDR_ABOUT_STATS_JS : IDR_ABOUT_STATS_HTML), - ui::SCALE_FACTOR_NONE).as_string(); + (query == kStatsJsPath ? + IDR_ABOUT_STATS_JS : IDR_ABOUT_STATS_HTML)).as_string(); if (query != kStatsJsPath) { // Clear the timer list since we stored the data in the timers list @@ -1115,7 +1113,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::string& path, } else if (host == chrome::kChromeUICreditsHost) { int idr = (path == kCreditsJsPath) ? IDR_CREDITS_JS : IDR_CREDITS_HTML; response = ResourceBundle::GetSharedInstance().GetRawDataResource( - idr, ui::SCALE_FACTOR_NONE).as_string(); + idr).as_string(); #if defined(OS_CHROMEOS) } else if (host == chrome::kChromeUIDiscardsHost) { response = AboutDiscards(path); @@ -1141,7 +1139,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::string& path, response = AboutNetwork(path); } else if (host == chrome::kChromeUIOSCreditsHost) { response = ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_OS_CREDITS_HTML, ui::SCALE_FACTOR_NONE).as_string(); + IDR_OS_CREDITS_HTML).as_string(); #endif #if defined(OS_LINUX) || defined(OS_OPENBSD) } else if (host == chrome::kChromeUISandboxHost) { diff --git a/chrome/browser/ui/webui/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks_ui.cc index 0ca9208..6d634cf 100644 --- a/chrome/browser/ui/webui/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks_ui.cc @@ -70,5 +70,5 @@ BookmarksUI::BookmarksUI(content::WebUI* web_ui) : WebUIController(web_ui) { base::RefCountedMemory* BookmarksUI::GetFaviconResourceBytes( ui::ScaleFactor scale_factor) { return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_BOOKMARKS_FAVICON, scale_factor); + LoadDataResourceBytesForScale(IDR_BOOKMARKS_FAVICON, scale_factor); } diff --git a/chrome/browser/ui/webui/chrome_web_ui_data_source.cc b/chrome/browser/ui/webui/chrome_web_ui_data_source.cc index 69c61f2..2b49cde 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_data_source.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_data_source.cc @@ -10,7 +10,6 @@ #include "base/string_util.h" #include "chrome/common/jstemplate_builder.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" ChromeWebUIDataSource::ChromeWebUIDataSource(const std::string& source_name) @@ -93,6 +92,6 @@ void ChromeWebUIDataSource::SendLocalizedStringsAsJSON(int request_id) { void ChromeWebUIDataSource::SendFromResourceBundle(int request_id, int idr) { scoped_refptr<base::RefCountedStaticMemory> response( ResourceBundle::GetSharedInstance().LoadDataResourceBytes( - idr, ui::SCALE_FACTOR_NONE)); + idr)); SendResponse(request_id, response); } diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc index c5d92c2..5ec84b8 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc @@ -41,7 +41,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "grit/browser_resources.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using content::WebContents; @@ -115,7 +114,7 @@ void OobeUIHTMLSource::StartDataRequest(const std::string& path, std::string OobeUIHTMLSource::GetDataResource(int resource_id) const { const base::StringPiece html( ResourceBundle::GetSharedInstance().GetRawDataResource( - resource_id, ui::SCALE_FACTOR_NONE)); + resource_id)); return jstemplate_builder::GetI18nTemplateHtml(html, localized_strings_.get()); } diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index b83a10c..f37cbc7 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -41,7 +41,6 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using chromeos::CellularNetwork; @@ -215,7 +214,7 @@ void MobileSetupUIHTMLSource::StartDataRequest(const std::string& path, static const base::StringPiece html( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_MOBILE_SETUP_PAGE_HTML, ui::SCALE_FACTOR_NONE)); + IDR_MOBILE_SETUP_PAGE_HTML)); std::string full_html = jstemplate_builder::GetI18nTemplateHtml(html, &strings); diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc index 0ae2e56..d8b9bbb 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc @@ -20,7 +20,6 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using content::WebContents; @@ -63,7 +62,7 @@ void ProxySettingsHTMLSource::StartDataRequest(const std::string& path, static const base::StringPiece html( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_PROXY_SETTINGS_HTML, ui::SCALE_FACTOR_NONE)); + IDR_PROXY_SETTINGS_HTML)); std::string full_html = jstemplate_builder::GetI18nTemplateHtml( html, localized_strings_.get()); diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc index de08f916..a1f7bca 100644 --- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc +++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc @@ -31,7 +31,6 @@ #include "content/public/browser/web_ui_message_handler.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using content::WebContents; @@ -174,8 +173,7 @@ void RegisterPageUIHTMLSource::StartDataRequest(const std::string& path, scoped_refptr<base::RefCountedMemory> html_bytes( ResourceBundle::GetSharedInstance().LoadDataResourceBytes( - IDR_HOST_REGISTRATION_PAGE_HTML, - ui::SCALE_FACTOR_NONE)); + IDR_HOST_REGISTRATION_PAGE_HTML)); SendResponse(request_id, html_bytes); } diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index 160707b..d114c6e 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc @@ -30,7 +30,6 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using content::BrowserThread; @@ -310,7 +309,7 @@ void SimUnlockUIHTMLSource::StartDataRequest(const std::string& path, static const base::StringPiece html( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_SIM_UNLOCK_HTML, ui::SCALE_FACTOR_NONE)); + IDR_SIM_UNLOCK_HTML)); std::string full_html = jstemplate_builder::GetI18nTemplateHtml(html, &strings); diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.cc b/chrome/browser/ui/webui/chromeos/system_info_ui.cc index ec444af..9699e23 100644 --- a/chrome/browser/ui/webui/chromeos/system_info_ui.cc +++ b/chrome/browser/ui/webui/chromeos/system_info_ui.cc @@ -36,7 +36,6 @@ #include "net/base/directory_lister.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using content::WebContents; @@ -149,7 +148,7 @@ void SystemInfoUIHTMLSource::RequestComplete() { } static const base::StringPiece systeminfo_html( ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_ABOUT_SYS_HTML, ui::SCALE_FACTOR_NONE)); + IDR_ABOUT_SYS_HTML)); std::string full_html = jstemplate_builder::GetTemplatesHtml( systeminfo_html, &strings, "t" /* template root node id */); SendResponse(request_id_, base::RefCountedString::TakeString(&full_html)); diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index ac7c197..0633cff 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc @@ -174,7 +174,7 @@ ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) { base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes( ui::ScaleFactor scale_factor) { return static_cast<base::RefCountedMemory*>( - ResourceBundle::GetSharedInstance().LoadDataResourceBytes( + ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( IDR_CONFLICT_FAVICON, scale_factor)); } diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc index 2949f25..519d827 100644 --- a/chrome/browser/ui/webui/crashes_ui.cc +++ b/chrome/browser/ui/webui/crashes_ui.cc @@ -172,7 +172,7 @@ CrashesUI::CrashesUI(content::WebUI* web_ui) : WebUIController(web_ui) { base::RefCountedMemory* CrashesUI::GetFaviconResourceBytes( ui::ScaleFactor scale_factor) { return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_SAD_FAVICON, scale_factor); + LoadDataResourceBytesForScale(IDR_SAD_FAVICON, scale_factor); } // static diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index a58de6a..14b04f4 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc @@ -19,7 +19,6 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using content::BrowserThread; @@ -67,7 +66,7 @@ void DevToolsDataSource::StartDataRequest(const std::string& path, " with --debug-devtools."; const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); scoped_refptr<base::RefCountedStaticMemory> bytes(rb.LoadDataResourceBytes( - resource_id, ui::SCALE_FACTOR_NONE)); + resource_id)); SendResponse(request_id, bytes); } diff --git a/chrome/browser/ui/webui/downloads_ui.cc b/chrome/browser/ui/webui/downloads_ui.cc index cf23d91..6cf8b79 100644 --- a/chrome/browser/ui/webui/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads_ui.cc @@ -108,5 +108,5 @@ DownloadsUI::DownloadsUI(content::WebUI* web_ui) : WebUIController(web_ui) { base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes( ui::ScaleFactor scale_factor) { return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_DOWNLOADS_FAVICON, scale_factor); + LoadDataResourceBytesForScale(IDR_DOWNLOADS_FAVICON, scale_factor); } diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 061eae7..d2704717 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -94,8 +94,8 @@ GURL ExtensionIconSource::GetIconURL(const extensions::Extension* extension, // static SkBitmap* ExtensionIconSource::LoadImageByResourceId(int resource_id) { std::string contents = ResourceBundle::GetSharedInstance() - .GetRawDataResource(resource_id, - ui::SCALE_FACTOR_100P).as_string(); + .GetRawDataResourceForScale(resource_id, + ui::SCALE_FACTOR_100P).as_string(); // Convert and return it. const unsigned char* data = diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index 48359c9..de4172b 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -116,7 +116,7 @@ void FaviconSource::StartDataRequest(const std::string& path, if (url.spec() == l10n_util::GetStringUTF8(history::kPrepopulatedPages[i].url_id)) { SendResponse(request_id, - ResourceBundle::GetSharedInstance().LoadDataResourceBytes( + ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( history::kPrepopulatedPages[i].favicon_id, scale_factor)); return; @@ -194,7 +194,7 @@ void FaviconSource::SendDefaultResponse(const IconRequest& icon_request) { if (!default_favicon) { ui::ScaleFactor scale_factor = icon_request.scale_factor; default_favicon = ResourceBundle::GetSharedInstance() - .LoadDataResourceBytes(resource_id, scale_factor); + .LoadDataResourceBytesForScale(resource_id, scale_factor); default_favicons_[favicon_index] = default_favicon; } diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index b909f0f..99827e4 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc @@ -169,7 +169,7 @@ FlagsUI::FlagsUI(content::WebUI* web_ui) : WebUIController(web_ui) { base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes( ui::ScaleFactor scale_factor) { return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_FLAGS_FAVICON, scale_factor); + LoadDataResourceBytesForScale(IDR_FLAGS_FAVICON, scale_factor); } // static diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index 3b327a0..e54d695 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -457,5 +457,5 @@ const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) { base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes( ui::ScaleFactor scale_factor) { return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_HISTORY_FAVICON, scale_factor); + LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor); } diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 159a06d..9e731ed 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -51,7 +51,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #if !defined(OS_ANDROID) @@ -393,7 +392,7 @@ void NewTabUI::NewTabHTMLSource::StartDataRequest(const std::string& path, scoped_refptr<base::RefCountedStaticMemory> resource_bytes( it->second.second ? ResourceBundle::GetSharedInstance().LoadDataResourceBytes( - it->second.second, ui::SCALE_FACTOR_NONE) : + it->second.second) : new base::RefCountedStaticMemory); SendResponse(request_id, resource_bytes); return; 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; diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc index 34214f8..bdce9e5 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc @@ -20,7 +20,6 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using content::BrowserThread; @@ -105,8 +104,7 @@ void NTPResourceCache::CreateNewTabHTML() { ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings); base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance(). - GetRawDataResource(IDR_NEW_TAB_ANDROID_HTML, - ui::SCALE_FACTOR_NONE)); + GetRawDataResource(IDR_NEW_TAB_ANDROID_HTML)); localized_strings.SetString( "device", CommandLine::ForCurrentProcess()->HasSwitch(switches::kTabletUI) ? diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc index 8cd5b21..5069c8b 100644 --- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc +++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc @@ -61,17 +61,19 @@ base::RefCountedMemory* UserImageSource::GetUserImage( return new base::RefCountedBytes(user->raw_image()); } else if (user->image_is_stub()) { return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_PROFILE_PICTURE_LOADING, scale_factor); + LoadDataResourceBytesForScale(IDR_PROFILE_PICTURE_LOADING, + scale_factor); } else if (user->HasDefaultImage()) { return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(kDefaultImageResourceIDs[user->image_index()], - scale_factor); + LoadDataResourceBytesForScale( + kDefaultImageResourceIDs[user->image_index()], + scale_factor); } else { NOTREACHED() << "User with custom image missing raw data"; } } return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_LOGIN_DEFAULT_USER, scale_factor); + LoadDataResourceBytesForScale(IDR_LOGIN_DEFAULT_USER, scale_factor); } UserImageSource::UserImageSource() diff --git a/chrome/browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.cc b/chrome/browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.cc index f10f32b..30b10bc 100644 --- a/chrome/browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.cc +++ b/chrome/browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.cc @@ -254,7 +254,7 @@ void WallpaperThumbnailSource::SendCurrentUserDefaultThumbnail( } const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); SendResponse(request_id, - rb.LoadDataResourceBytes(idr, scale_factor)); + rb.LoadDataResourceBytesForScale(idr, scale_factor)); } } // namespace options diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 70a83c2..66e60ad 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -147,11 +147,11 @@ void OptionsUIHTMLSource::StartDataRequest(const std::string& path, } else if (path == kOptionsBundleJsFile) { // Return (and cache) the options javascript code. response_bytes = ui::ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_OPTIONS_BUNDLE_JS, ui::SCALE_FACTOR_NONE); + LoadDataResourceBytes(IDR_OPTIONS_BUNDLE_JS); } else { // Return (and cache) the main options html page as the default. response_bytes = ui::ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_OPTIONS_HTML, ui::SCALE_FACTOR_NONE); + LoadDataResourceBytes(IDR_OPTIONS_HTML); } SendResponse(request_id, response_bytes); @@ -351,7 +351,7 @@ void OptionsUI::ProcessAutocompleteSuggestions( base::RefCountedMemory* OptionsUI::GetFaviconResourceBytes( ui::ScaleFactor scale_factor) { return ui::ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_SETTINGS_FAVICON, scale_factor); + LoadDataResourceBytesForScale(IDR_SETTINGS_FAVICON, scale_factor); } void OptionsUI::InitializeHandlers() { diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 57471a8..019fcb2 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -487,7 +487,7 @@ PluginsUI::PluginsUI(content::WebUI* web_ui) : WebUIController(web_ui) { base::RefCountedMemory* PluginsUI::GetFaviconResourceBytes( ui::ScaleFactor scale_factor) { return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_PLUGINS_FAVICON, scale_factor); + LoadDataResourceBytesForScale(IDR_PLUGINS_FAVICON, scale_factor); } // static diff --git a/chrome/browser/ui/webui/shared_resources_data_source.cc b/chrome/browser/ui/webui/shared_resources_data_source.cc index 1952def..98c08e8 100644 --- a/chrome/browser/ui/webui/shared_resources_data_source.cc +++ b/chrome/browser/ui/webui/shared_resources_data_source.cc @@ -18,7 +18,6 @@ #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "net/base/mime_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" namespace { @@ -56,7 +55,7 @@ void SharedResourcesDataSource::StartDataRequest(const std::string& path, DCHECK_NE(-1, idr) << " path: " << path; const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); scoped_refptr<base::RefCountedStaticMemory> bytes( - rb.LoadDataResourceBytes(idr, ui::SCALE_FACTOR_NONE)); + rb.LoadDataResourceBytes(idr)); SendResponse(request_id, bytes); } diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index ca6124a..1ffb6e2 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -135,7 +135,8 @@ void ThemeSource::SendThemeBitmap(int request_id, } else { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - SendResponse(request_id, - rb.LoadDataResourceBytes(resource_id, scale_factor)); + SendResponse( + request_id, + rb.LoadDataResourceBytesForScale(resource_id, scale_factor)); } } diff --git a/chrome/browser/ui/webui/web_ui_util.cc b/chrome/browser/ui/webui/web_ui_util.cc index 2001090..6a21b1c 100644 --- a/chrome/browser/ui/webui/web_ui_util.cc +++ b/chrome/browser/ui/webui/web_ui_util.cc @@ -51,8 +51,8 @@ std::string GetBitmapDataUrl(const SkBitmap& bitmap) { std::string GetBitmapDataUrlFromResource(int res) { // Load resource icon and covert to base64 encoded data url base::RefCountedStaticMemory* icon_data = - ResourceBundle::GetSharedInstance().LoadDataResourceBytes(res, - ui::SCALE_FACTOR_100P); + ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( + res, ui::SCALE_FACTOR_100P); if (!icon_data) return std::string(); scoped_refptr<base::RefCountedMemory> raw_icon(icon_data); |