diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-22 18:09:58 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-22 18:09:58 +0000 |
commit | e100a75b541afb6d79e5ff86d0ef6ae798f44c62 (patch) | |
tree | d9e537596e46b05b38ddd600790433ab6dd23b34 /chrome/browser/bookmarks | |
parent | dffee0bef4842f3b0c3a0a134090a2f870beb870 (diff) | |
download | chromium_src-e100a75b541afb6d79e5ff86d0ef6ae798f44c62.zip chromium_src-e100a75b541afb6d79e5ff86d0ef6ae798f44c62.tar.gz chromium_src-e100a75b541afb6d79e5ff86d0ef6ae798f44c62.tar.bz2 |
bookmarks: Forward declare FaviconBitmapResult in bookmark_html_writer.h
BUG=144783
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11624028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer.cc | 4 | ||||
-rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer.h | 10 | ||||
-rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer_unittest.cc | 10 |
3 files changed, 14 insertions, 10 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index fc739d1..a855279 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -8,9 +8,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #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" @@ -20,6 +17,7 @@ #include "chrome/browser/bookmarks/bookmark_codec.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" +#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h index 0ceb58e..ddc669e 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.h +++ b/chrome/browser/bookmarks/bookmark_html_writer.h @@ -9,16 +9,20 @@ #include <map> #include <string> +#include "base/file_path.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/history/history.h" +#include "base/memory/ref_counted_memory.h" #include "chrome/common/cancelable_task_tracker.h" +#include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "net/base/file_stream.h" class BookmarkNode; -class FilePath; class Profile; +namespace history { +struct FaviconBitmapResult; +} + // Observer for bookmark html output. Used only in tests. class BookmarksExportObserver { public: diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index ede4e70..5f1f72d 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "testing/gtest/include/gtest/gtest.h" +#include "chrome/browser/bookmarks/bookmark_html_writer.h" #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" @@ -13,15 +13,17 @@ #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/bookmarks/bookmark_html_writer.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" +#include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" +#include "chrome/browser/history/history.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/importer/firefox2_importer.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" #include "grit/generated_resources.h" +#include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/codec/png_codec.h" @@ -30,8 +32,8 @@ using content::BrowserThread; namespace { -static const int kIconWidth = 16; -static const int kIconHeight = 16; +const int kIconWidth = 16; +const int kIconHeight = 16; void MakeTestSkBitmap(int w, int h, SkBitmap* bmp) { bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h); |