diff options
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index 7dfe7ef..aa6d7b0 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/file_path.h" #include "base/memory/ref_counted.h" +#include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" @@ -261,7 +262,7 @@ class Writer : public base::RefCountedThreadSafe<Writer> { BookmarkFaviconFetcher::URLFaviconMap::iterator itr = favicons_map_->find(url_string); if (itr != favicons_map_->end()) { - scoped_refptr<RefCountedMemory> data(itr->second.get()); + scoped_refptr<base::RefCountedMemory> data(itr->second.get()); std::string favicon_data; favicon_data.assign(reinterpret_cast<const char*>(data->front()), data->size()); diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h index 6342281..7016ddc 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.h +++ b/chrome/browser/bookmarks/bookmark_html_writer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -35,7 +35,8 @@ class BookmarksExportObserver { class BookmarkFaviconFetcher: public content::NotificationObserver { public: // Map of URL and corresponding favicons. - typedef std::map<std::string, scoped_refptr<RefCountedMemory> > URLFaviconMap; + typedef std::map<std::string, scoped_refptr<base::RefCountedMemory> > + URLFaviconMap; BookmarkFaviconFetcher(Profile* profile, const FilePath& path, |