summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_theme_provider.cc2
-rw-r--r--chrome/browser/dom_ui/dom_ui_favicon_source.cc2
-rw-r--r--chrome/browser/dom_ui/dom_ui_thumbnail_source.cc4
-rw-r--r--chrome/browser/dom_ui/downloads_ui.cc2
-rw-r--r--chrome/browser/dom_ui/history_ui.cc2
-rw-r--r--chrome/browser/extensions/extensions_ui.cc2
-rw-r--r--chrome/browser/sync/sync_setup_wizard.cc2
7 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index 759dc59..7f598a7 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -459,7 +459,7 @@ RefCountedMemory* BrowserThemeProvider::GetRawData(int id) const {
RefCountedMemory* data = ReadThemeFileData(id);
if (!data)
- data = rb_.LoadImageResourceBytes(id);
+ data = rb_.LoadDataResourceBytes(id);
if (!data)
return NULL;
diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.cc b/chrome/browser/dom_ui/dom_ui_favicon_source.cc
index dfb4d40..34af8fb 100644
--- a/chrome/browser/dom_ui/dom_ui_favicon_source.cc
+++ b/chrome/browser/dom_ui/dom_ui_favicon_source.cc
@@ -55,7 +55,7 @@ void DOMUIFavIconSource::OnFavIconDataAvailable(
} else {
if (!default_favicon_.get()) {
default_favicon_ =
- ResourceBundle::GetSharedInstance().LoadImageResourceBytes(
+ ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
IDR_DEFAULT_FAVICON);
}
diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
index f707e7e..2194ff2 100644
--- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
+++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
@@ -65,7 +65,7 @@ void DOMUIThumbnailSource::DoDataRequest(const std::string& path,
// Don't have the thumbnail so return the default thumbnail.
if (!default_thumbnail_.get()) {
default_thumbnail_ =
- ResourceBundle::GetSharedInstance().LoadImageResourceBytes(
+ ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
IDR_DEFAULT_THUMBNAIL);
}
SendResponse(request_id, default_thumbnail_);
@@ -84,7 +84,7 @@ void DOMUIThumbnailSource::OnThumbnailDataAvailable(
} else {
if (!default_thumbnail_.get()) {
default_thumbnail_ =
- ResourceBundle::GetSharedInstance().LoadImageResourceBytes(
+ ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
IDR_DEFAULT_THUMBNAIL);
}
diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc
index f12e812..e74ed23 100644
--- a/chrome/browser/dom_ui/downloads_ui.cc
+++ b/chrome/browser/dom_ui/downloads_ui.cc
@@ -139,5 +139,5 @@ DownloadsUI::DownloadsUI(TabContents* contents) : DOMUI(contents) {
// static
RefCountedMemory* DownloadsUI::GetFaviconResourceBytes() {
return ResourceBundle::GetSharedInstance().
- LoadImageResourceBytes(IDR_DOWNLOADS_FAVICON);
+ LoadDataResourceBytes(IDR_DOWNLOADS_FAVICON);
}
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index a97992b..0d78ddd 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.cc
@@ -383,5 +383,5 @@ const GURL HistoryUI::GetHistoryURLWithSearchText(const std::wstring& text) {
// static
RefCountedMemory* HistoryUI::GetFaviconResourceBytes() {
return ResourceBundle::GetSharedInstance().
- LoadImageResourceBytes(IDR_HISTORY_FAVICON);
+ LoadDataResourceBytes(IDR_HISTORY_FAVICON);
}
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 7eb58bb..bce29b5 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -745,7 +745,7 @@ ExtensionsUI::ExtensionsUI(TabContents* contents) : DOMUI(contents) {
// static
RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() {
return ResourceBundle::GetSharedInstance().
- LoadImageResourceBytes(IDR_PLUGIN);
+ LoadDataResourceBytes(IDR_PLUGIN);
}
// static
diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc
index e003b49..1faf61f 100644
--- a/chrome/browser/sync/sync_setup_wizard.cc
+++ b/chrome/browser/sync/sync_setup_wizard.cc
@@ -64,7 +64,7 @@ void SyncResourcesSource::StartDataRequest(const std::string& path_raw,
scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
if (path_raw == chrome::kSyncThrobberPath) {
scoped_refptr<RefCountedMemory> throbber(
- ResourceBundle::GetSharedInstance().LoadImageResourceBytes(
+ ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
IDR_THROBBER));
SendResponse(request_id, throbber);
return;