diff options
Diffstat (limited to 'chrome/browser/ui/webui/options2')
| -rw-r--r-- | chrome/browser/ui/webui/options2/options_ui2.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options2/options_ui2.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui2.cc index 404c6f2..63f9c1a 100644 --- a/chrome/browser/ui/webui/options2/options_ui2.cc +++ b/chrome/browser/ui/webui/options2/options_ui2.cc @@ -137,7 +137,7 @@ OptionsUIHTMLSource::OptionsUIHTMLSource(DictionaryValue* localized_strings) void OptionsUIHTMLSource::StartDataRequest(const std::string& path, bool is_incognito, int request_id) { - scoped_refptr<RefCountedMemory> response_bytes; + scoped_refptr<base::RefCountedMemory> response_bytes; SetFontAndTextDirection(localized_strings_.get()); if (path == kLocalizedStringsFile) { @@ -352,7 +352,7 @@ void OptionsUI::ProcessAutocompleteSuggestions( } // static -RefCountedMemory* OptionsUI::GetFaviconResourceBytes() { +base::RefCountedMemory* OptionsUI::GetFaviconResourceBytes() { return ResourceBundle::GetSharedInstance(). LoadDataResourceBytes(IDR_SETTINGS_FAVICON); } diff --git a/chrome/browser/ui/webui/options2/options_ui2.h b/chrome/browser/ui/webui/options2/options_ui2.h index 9cbf0c7..f45fb8e 100644 --- a/chrome/browser/ui/webui/options2/options_ui2.h +++ b/chrome/browser/ui/webui/options2/options_ui2.h @@ -110,7 +110,7 @@ class OptionsUI : public content::WebUIController, const AutocompleteResult& autocompleteResult, base::ListValue * const suggestions); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); // Overridden from OptionsPageUIHandlerHost: virtual void InitializeHandlers() OVERRIDE; |