diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 20:27:42 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 20:27:42 +0000 |
| commit | 64bd0217b9360b1981491eeeeb3ebab288a69ee2 (patch) | |
| tree | 946a6d50f76ea4a0e25c409848fec87e1f848380 /chrome/browser/browsing_data | |
| parent | 685c0a0278eef86fc933e28524672bcf3a2db973 (diff) | |
| download | chromium_src-64bd0217b9360b1981491eeeeb3ebab288a69ee2.zip chromium_src-64bd0217b9360b1981491eeeeb3ebab288a69ee2.tar.gz chromium_src-64bd0217b9360b1981491eeeeb3ebab288a69ee2.tar.bz2 | |
Load the default favicon as a native image, rather than as a Skia image.
This silences a line of log spew that's generated on every launch of a local
debug build.
BUG=none
TEST=less log spew
R=rsesek@chromium.org
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/333493002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data')
| -rw-r--r-- | chrome/browser/browsing_data/cookies_tree_model.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc index 037c481..5663eb0 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.cc +++ b/chrome/browser/browsing_data/cookies_tree_model.cc @@ -883,12 +883,12 @@ CookiesTreeModel::~CookiesTreeModel() { // Returns the set of icons for the nodes in the tree. You only need override // this if you don't want to use the default folder icons. void CookiesTreeModel::GetIcons(std::vector<gfx::ImageSkia>* icons) { - icons->push_back(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed( - IDR_DEFAULT_FAVICON)); - icons->push_back(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed( - IDR_COOKIE_ICON)); - icons->push_back(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed( - IDR_COOKIE_STORAGE_ICON)); + icons->push_back(*ResourceBundle::GetSharedInstance().GetNativeImageNamed( + IDR_DEFAULT_FAVICON).ToImageSkia()); + icons->push_back(*ResourceBundle::GetSharedInstance().GetNativeImageNamed( + IDR_COOKIE_ICON).ToImageSkia()); + icons->push_back(*ResourceBundle::GetSharedInstance().GetNativeImageNamed( + IDR_COOKIE_STORAGE_ICON).ToImageSkia()); } // Returns the index of the icon to use for |node|. Return -1 to use the |