| Index: chrome/browser/ui/webui/options2/options_ui2.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/options2/options_ui2.cc (revision 134496)
|
| +++ chrome/browser/ui/webui/options2/options_ui2.cc (working copy)
|
| @@ -137,7 +137,7 @@
|
| 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) {
|
| @@ -360,7 +360,7 @@
|
| }
|
|
|
| // static
|
| -RefCountedMemory* OptionsUI::GetFaviconResourceBytes() {
|
| +base::RefCountedMemory* OptionsUI::GetFaviconResourceBytes() {
|
| return ResourceBundle::GetSharedInstance().
|
| LoadDataResourceBytes(IDR_SETTINGS_FAVICON);
|
| }
|
|
|