diff options
43 files changed, 77 insertions, 77 deletions
diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index fd5312a..a3c0c3b 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -1069,7 +1069,7 @@ void AeroPeekManager::CreateAeroPeekWindowIfNecessary(TabContentsWrapper* tab, GetTabID(tab->tab_contents()), foreground, tab->tab_contents()->GetTitle(), - tab->tab_contents()->GetFavIcon()); + tab->tab_contents()->GetFavicon()); tab_list_.push_back(window); } @@ -1174,7 +1174,7 @@ void AeroPeekManager::TabChangedAt(TabContentsWrapper* contents, // hurting the rendering performance. (These functions just save the // information needed for handling update requests from Windows.) window->SetTitle(contents->tab_contents()->GetTitle()); - window->SetFavIcon(contents->tab_contents()->GetFavIcon()); + window->SetFavIcon(contents->tab_contents()->GetFavicon()); window->Update(contents->tab_contents()->is_loading()); } diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 536629c..b52a0af 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -234,7 +234,7 @@ void AutocompleteEditModel::GetDataForURLExport(GURL* url, if (*url == URLFixerUpper::FixupURL(UTF16ToUTF8(permanent_text_), std::string())) { *title = controller_->GetTitle(); - *favicon = controller_->GetFavIcon(); + *favicon = controller_->GetFavicon(); } } diff --git a/chrome/browser/autocomplete/autocomplete_edit.h b/chrome/browser/autocomplete/autocomplete_edit.h index 2ea41b8..41e05e9 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.h +++ b/chrome/browser/autocomplete/autocomplete_edit.h @@ -69,7 +69,7 @@ class AutocompleteEditController { virtual void OnSetFocus() = 0; // Returns the favicon of the current page. - virtual SkBitmap GetFavIcon() const = 0; + virtual SkBitmap GetFavicon() const = 0; // Returns the title of the current page. virtual string16 GetTitle() const = 0; diff --git a/chrome/browser/autocomplete/autocomplete_edit_unittest.cc b/chrome/browser/autocomplete/autocomplete_edit_unittest.cc index c915f751..2a51f91 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_unittest.cc @@ -82,7 +82,7 @@ class TestingAutocompleteEditController : public AutocompleteEditController { virtual void OnInputInProgress(bool in_progress) OVERRIDE {} virtual void OnKillFocus() OVERRIDE {} virtual void OnSetFocus() OVERRIDE {} - virtual SkBitmap GetFavIcon() const OVERRIDE { return SkBitmap(); } + virtual SkBitmap GetFavicon() const OVERRIDE { return SkBitmap(); } virtual string16 GetTitle() const OVERRIDE { return string16(); } virtual InstantController* GetInstant() OVERRIDE { return NULL; } virtual TabContentsWrapper* GetTabContentsWrapper() OVERRIDE { diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 6c5ad73..60edcfa 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -241,7 +241,7 @@ void BookmarkModel::Copy(const BookmarkNode* node, store_->ScheduleSave(); } -const SkBitmap& BookmarkModel::GetFavIcon(const BookmarkNode* node) { +const SkBitmap& BookmarkModel::GetFavicon(const BookmarkNode* node) { DCHECK(node); if (!node->is_favicon_loaded()) { BookmarkNode* mutable_node = AsMutable(node); diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index e29dfbc..91028bf1 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -226,7 +226,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService { // Returns the favicon for |node|. If the favicon has not yet been // loaded it is loaded and the observer of the model notified when done. - const SkBitmap& GetFavIcon(const BookmarkNode* node); + const SkBitmap& GetFavicon(const BookmarkNode* node); // Sets the title of the specified node. void SetTitle(const BookmarkNode* node, const string16& title); diff --git a/chrome/browser/chromeos/wm_overview_controller.cc b/chrome/browser/chromeos/wm_overview_controller.cc index fefbbc9..e79d360 100644 --- a/chrome/browser/chromeos/wm_overview_controller.cc +++ b/chrome/browser/chromeos/wm_overview_controller.cc @@ -239,7 +239,7 @@ void BrowserListener::TabChangedAt( snapshots_[index].title->SetTitle(contents->tab_contents()->GetTitle()); snapshots_[index].title->SetUrl(contents->tab_contents()->GetURL()); snapshots_[index].fav_icon->SetFavIcon( - contents->tab_contents()->GetFavIcon()); + contents->tab_contents()->GetFavicon()); if (change_type != TabStripModelObserver::TITLE_NOT_LOADING) MarkSnapshotAsDirty(index); } @@ -424,7 +424,7 @@ void BrowserListener::InsertSnapshot(int index) { node.fav_icon = new WmOverviewFavIcon; node.fav_icon->Init(node.snapshot); - node.fav_icon->SetFavIcon(browser_->GetTabContentsAt(index)->GetFavIcon()); + node.fav_icon->SetFavIcon(browser_->GetTabContentsAt(index)->GetFavicon()); node.title = new WmOverviewTitle; node.title->Init(gfx::Size(std::max(0, cell_size.width() - diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc index 96f609d..90e79f5 100644 --- a/chrome/browser/content_setting_bubble_model.cc +++ b/chrome/browser/content_setting_bubble_model.cc @@ -382,7 +382,7 @@ class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup { title = l10n_util::GetStringUTF8(IDS_TAB_LOADING_TITLE); PopupItem popup_item; popup_item.title = title; - popup_item.bitmap = (*i)->GetFavIcon(); + popup_item.bitmap = (*i)->GetFavicon(); popup_item.tab_contents = (*i); add_popup(popup_item); } diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 5e53484..f08ed8b 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -68,7 +68,7 @@ class ExpireHistoryTest : public testing::Test, bool HasFavIcon(FavIconID favicon_id); bool HasThumbnail(URLID url_id); - FavIconID GetFavIcon(const GURL& page_url, IconType icon_type); + FavIconID GetFavicon(const GURL& page_url, IconType icon_type); // Returns the number of text matches for the given URL in the example data // added by AddExampleData. @@ -316,11 +316,11 @@ bool ExpireHistoryTest::HasFavIcon(FavIconID favicon_id) { Time last_updated; std::vector<unsigned char> icon_data_unused; GURL icon_url; - return thumb_db_->GetFavIcon(favicon_id, &last_updated, &icon_data_unused, + return thumb_db_->GetFavicon(favicon_id, &last_updated, &icon_data_unused, &icon_url); } -FavIconID ExpireHistoryTest::GetFavIcon(const GURL& page_url, +FavIconID ExpireHistoryTest::GetFavicon(const GURL& page_url, IconType icon_type) { IconMapping icon_mapping; thumb_db_->GetIconMappingForPageURL(page_url, icon_type, &icon_mapping); @@ -460,7 +460,7 @@ TEST_F(ExpireHistoryTest, FLAKY_DeleteURLAndFavicon) { // Verify things are the way we expect with a URL row, favicon, thumbnail. URLRow last_row; ASSERT_TRUE(main_db_->GetURLRow(url_ids[2], &last_row)); - FavIconID fav_icon_id = GetFavIcon(last_row.url(), FAV_ICON); + FavIconID fav_icon_id = GetFavicon(last_row.url(), FAV_ICON); EXPECT_TRUE(HasFavIcon(fav_icon_id)); // TODO(sky): fix this, see comment in HasThumbnail. // EXPECT_TRUE(HasThumbnail(url_ids[2])); @@ -510,7 +510,7 @@ TEST_F(ExpireHistoryTest, FLAKY_DeleteURLAndFavicon) { // All the normal data + the favicon should be gone. EnsureURLInfoGone(last_row); - EXPECT_FALSE(GetFavIcon(last_row.url(), FAV_ICON)); + EXPECT_FALSE(GetFavicon(last_row.url(), FAV_ICON)); EXPECT_FALSE(HasFavIcon(fav_icon_id)); } @@ -524,7 +524,7 @@ TEST_F(ExpireHistoryTest, DeleteURLWithoutFavicon) { // Verify things are the way we expect with a URL row, favicon, thumbnail. URLRow last_row; ASSERT_TRUE(main_db_->GetURLRow(url_ids[1], &last_row)); - FavIconID fav_icon_id = GetFavIcon(last_row.url(), FAV_ICON); + FavIconID fav_icon_id = GetFavicon(last_row.url(), FAV_ICON); EXPECT_TRUE(HasFavIcon(fav_icon_id)); // TODO(sky): fix this, see comment in HasThumbnail. // EXPECT_TRUE(HasThumbnail(url_ids[1])); @@ -562,7 +562,7 @@ TEST_F(ExpireHistoryTest, DontDeleteStarredURL) { ASSERT_TRUE(main_db_->GetRowForURL(url, &url_row)); // And the favicon should exist. - FavIconID fav_icon_id = GetFavIcon(url_row.url(), FAV_ICON); + FavIconID fav_icon_id = GetFavicon(url_row.url(), FAV_ICON); EXPECT_TRUE(HasFavIcon(fav_icon_id)); // But there should be no fts. @@ -632,13 +632,13 @@ TEST_F(ExpireHistoryTest, FlushRecentURLsUnstarred) { EXPECT_EQ(0, temp_row.typed_count()); // Verify that the middle URL's favicon and thumbnail is still there. - FavIconID fav_icon_id = GetFavIcon(url_row1.url(), FAV_ICON); + FavIconID fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON); EXPECT_TRUE(HasFavIcon(fav_icon_id)); // TODO(sky): fix this, see comment in HasThumbnail. // EXPECT_TRUE(HasThumbnail(url_row1.id())); // Verify that the last URL was deleted. - FavIconID fav_icon_id2 = GetFavIcon(url_row2.url(), FAV_ICON); + FavIconID fav_icon_id2 = GetFavicon(url_row2.url(), FAV_ICON); EnsureURLInfoGone(url_row2); EXPECT_FALSE(HasFavIcon(fav_icon_id2)); } @@ -691,7 +691,7 @@ TEST_F(ExpireHistoryTest, FlushRecentURLsUnstarredRestricted) { EXPECT_EQ(0, temp_row.typed_count()); // Verify that the middle URL's favicon and thumbnail is still there. - FavIconID fav_icon_id = GetFavIcon(url_row1.url(), FAV_ICON); + FavIconID fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON); EXPECT_TRUE(HasFavIcon(fav_icon_id)); // TODO(sky): fix this, see comment in HasThumbnail. // EXPECT_TRUE(HasThumbnail(url_row1.id())); @@ -740,11 +740,11 @@ TEST_F(ExpireHistoryTest, FlushRecentURLsStarred) { // that may have been updated since the time threshold. Since the URL still // exists in history, this should not be a privacy problem, we only update // the visit counts in this case for consistency anyway. - FavIconID fav_icon_id = GetFavIcon(url_row1.url(), FAV_ICON); + FavIconID fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON); EXPECT_TRUE(HasFavIcon(fav_icon_id)); // TODO(sky): fix this, see comment in HasThumbnail. // EXPECT_TRUE(HasThumbnail(new_url_row1.id())); - fav_icon_id = GetFavIcon(url_row1.url(), FAV_ICON); + fav_icon_id = GetFavicon(url_row1.url(), FAV_ICON); EXPECT_TRUE(HasFavIcon(fav_icon_id)); // TODO(sky): fix this, see comment in HasThumbnail. // EXPECT_TRUE(HasThumbnail(new_url_row2.id())); diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc index d097f09..c0d7f12 100644 --- a/chrome/browser/history/history.cc +++ b/chrome/browser/history/history.cc @@ -450,7 +450,7 @@ HistoryService::Handle HistoryService::GetPageThumbnail( void HistoryService::GetFavicon(FaviconService::GetFaviconRequest* request, const GURL& icon_url) { - Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavIcon, NULL, request, + Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavicon, NULL, request, icon_url, history::FAV_ICON); } diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index b303dc12..5951ef6 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -1600,7 +1600,7 @@ bool HistoryBackend::GetThumbnailFromOlderRedirect( return success; } -void HistoryBackend::GetFavIcon(scoped_refptr<GetFavIconRequest> request, +void HistoryBackend::GetFavicon(scoped_refptr<GetFavIconRequest> request, const GURL& icon_url, int icon_types) { UpdateFavIconMappingAndFetchImpl(NULL, icon_url, request, icon_types); @@ -1717,7 +1717,7 @@ void HistoryBackend::UpdateFavIconMappingAndFetchImpl( data = new RefCountedBytes; know_favicon = true; Time last_updated; - if (thumbnail_db_->GetFavIcon(favicon_id, &last_updated, &data->data, + if (thumbnail_db_->GetFavicon(favicon_id, &last_updated, &data->data, NULL)) { expired = (Time::Now() - last_updated) > TimeDelta::FromDays(kFavIconRefetchDays); @@ -1756,7 +1756,7 @@ void HistoryBackend::GetFavIconForURL( Time last_updated; if (thumbnail_db_->GetIconMappingsForPageURL(page_url, &icon_mappings) && (icon_mappings.front().icon_type & icon_types) && - thumbnail_db_->GetFavIcon(icon_mappings.front().icon_id, &last_updated, + thumbnail_db_->GetFavicon(icon_mappings.front().icon_id, &last_updated, &data->data, &icon_url)) { know_favicon = true; expired = (Time::Now() - last_updated) > diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h index 06be843..3d9dd80 100644 --- a/chrome/browser/history/history_backend.h +++ b/chrome/browser/history/history_backend.h @@ -209,7 +209,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, // Favicon ------------------------------------------------------------------- - void GetFavIcon(scoped_refptr<GetFavIconRequest> request, + void GetFavicon(scoped_refptr<GetFavIconRequest> request, const GURL& icon_url, int icon_types); @@ -443,7 +443,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, // Favicons ------------------------------------------------------------------ - // Used by both UpdateFavIconMappingAndFetch and GetFavIcon. + // Used by both UpdateFavIconMappingAndFetch and GetFavicon. // If page_url is non-null and SetFavIcon has previously been invoked for // icon_url the favicon url for page_url (and all redirects) is set to // icon_url. diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index 96a44e8..3e0ac18 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -130,7 +130,7 @@ class HistoryBackendTest : public testing::Test { return test_dir_; } - FavIconID GetFavIcon(const GURL& url, IconType icon_type) { + FavIconID GetFavicon(const GURL& url, IconType icon_type) { IconMapping icon_mapping; if (backend_->thumbnail_db_->GetIconMappingForPageURL(url, icon_type, &icon_mapping)) @@ -331,7 +331,7 @@ TEST_F(HistoryBackendTest, DeleteAll) { // The remaining URL should still reference the same favicon, even if its // ID has changed. - EXPECT_EQ(out_favicon1, GetFavIcon(outrow1.url(), FAV_ICON)); + EXPECT_EQ(out_favicon1, GetFavicon(outrow1.url(), FAV_ICON)); // The first URL should still be bookmarked. EXPECT_TRUE(bookmark_model_.IsBookmarked(row1.url())); @@ -543,8 +543,8 @@ TEST_F(HistoryBackendTest, ImportedFaviconsTest) { URLRow url_row1, url_row2; EXPECT_FALSE(backend_->db_->GetRowForURL(row1.url(), &url_row1) == 0); EXPECT_FALSE(backend_->db_->GetRowForURL(row2.url(), &url_row2) == 0); - EXPECT_FALSE(GetFavIcon(row1.url(), FAV_ICON) == 0); - EXPECT_TRUE(GetFavIcon(row2.url(), FAV_ICON) == 0); + EXPECT_FALSE(GetFavicon(row1.url(), FAV_ICON) == 0); + EXPECT_TRUE(GetFavicon(row2.url(), FAV_ICON) == 0); // Now provide one imported favicon for both URLs already in the registry. // The new favicon should only be used with the URL that doesn't already have @@ -559,10 +559,10 @@ TEST_F(HistoryBackendTest, ImportedFaviconsTest) { backend_->SetImportedFavicons(favicons); EXPECT_FALSE(backend_->db_->GetRowForURL(row1.url(), &url_row1) == 0); EXPECT_FALSE(backend_->db_->GetRowForURL(row2.url(), &url_row2) == 0); - EXPECT_FALSE(GetFavIcon(row1.url(), FAV_ICON) == 0); - EXPECT_FALSE(GetFavIcon(row2.url(), FAV_ICON) == 0); - EXPECT_FALSE(GetFavIcon(row1.url(), FAV_ICON) == - GetFavIcon(row2.url(), FAV_ICON)); + EXPECT_FALSE(GetFavicon(row1.url(), FAV_ICON) == 0); + EXPECT_FALSE(GetFavicon(row2.url(), FAV_ICON) == 0); + EXPECT_FALSE(GetFavicon(row1.url(), FAV_ICON) == + GetFavicon(row2.url(), FAV_ICON)); // A URL should not be added to history (to store favicon), if // the URL is not bookmarked. diff --git a/chrome/browser/history/page_usage_data.h b/chrome/browser/history/page_usage_data.h index 41d9841..3c6c3c7 100644 --- a/chrome/browser/history/page_usage_data.h +++ b/chrome/browser/history/page_usage_data.h @@ -97,7 +97,7 @@ class PageUsageData { favicon_pending_ = pending; } - const SkBitmap* GetFavIcon() const { + const SkBitmap* GetFavicon() const { return favicon_; } diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc index 28a0d93..edb9ca9 100644 --- a/chrome/browser/history/thumbnail_database.cc +++ b/chrome/browser/history/thumbnail_database.cc @@ -418,7 +418,7 @@ FavIconID ThumbnailDatabase::GetFavIconIDForFavIconURL(const GURL& icon_url, return statement.ColumnInt64(0); } -bool ThumbnailDatabase::GetFavIcon( +bool ThumbnailDatabase::GetFavicon( FavIconID icon_id, base::Time* last_updated, std::vector<unsigned char>* png_icon_data, diff --git a/chrome/browser/history/thumbnail_database.h b/chrome/browser/history/thumbnail_database.h index b210729..210d97f 100644 --- a/chrome/browser/history/thumbnail_database.h +++ b/chrome/browser/history/thumbnail_database.h @@ -118,7 +118,7 @@ class ThumbnailDatabase { // Gets the png encoded favicon and last updated time for the specified // favicon id. - bool GetFavIcon(FavIconID icon_id, + bool GetFavicon(FavIconID icon_id, base::Time* last_updated, std::vector<unsigned char>* png_icon_data, GURL* icon_url); diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc index cd40298..910b5a6 100644 --- a/chrome/browser/history/thumbnail_database_unittest.cc +++ b/chrome/browser/history/thumbnail_database_unittest.cc @@ -127,7 +127,7 @@ TEST_F(ThumbnailDatabaseTest, GetFaviconAfterMigrationToTopSites) { base::Time time_out; std::vector<unsigned char> favicon_out; GURL url_out; - EXPECT_TRUE(db.GetFavIcon(id, &time_out, &favicon_out, &url_out)); + EXPECT_TRUE(db.GetFavicon(id, &time_out, &favicon_out, &url_out)); EXPECT_EQ(url, url_out); EXPECT_EQ(time.ToTimeT(), time_out.ToTimeT()); ASSERT_EQ(data.size(), favicon_out.size()); @@ -429,7 +429,7 @@ TEST_F(IconMappingMigrationTest, TestIconMappingMigration) { base::Time time; std::vector<unsigned char> out_data; GURL out_icon_url; - ASSERT_TRUE(db.GetFavIcon( + ASSERT_TRUE(db.GetFavicon( icon_mappings[0].icon_id, &time, &out_data, &out_icon_url)); EXPECT_EQ(icon1, out_icon_url); @@ -450,7 +450,7 @@ TEST_F(IconMappingMigrationTest, TestIconMappingMigration) { EXPECT_EQ(FAV_ICON, icon_mappings[0].icon_type); EXPECT_EQ(page_url2, icon_mappings[0].page_url); EXPECT_EQ(2, icon_mappings[0].icon_id); - ASSERT_TRUE(db.GetFavIcon( + ASSERT_TRUE(db.GetFavicon( icon_mappings[0].icon_id, &time, &out_data, &out_icon_url)); EXPECT_EQ(icon2, out_icon_url); diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index a410047..d5eaaa0 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -61,7 +61,7 @@ void BookmarkChangeProcessor::UpdateSyncNodeProperties( void BookmarkChangeProcessor::EncodeFavicon(const BookmarkNode* src, BookmarkModel* model, std::vector<unsigned char>* dst) { - const SkBitmap& favicon = model->GetFavIcon(src); + const SkBitmap& favicon = model->GetFavicon(src); dst->clear(); diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index e2e5d14..b91da00 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -199,7 +199,7 @@ string16 TaskManagerTabContentsResource::GetTitle() const { } SkBitmap TaskManagerTabContentsResource::GetIcon() const { - return tab_contents_->GetFavIcon(); + return tab_contents_->GetFavicon(); } TabContents* TaskManagerTabContentsResource::GetTabContents() const { diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 562f716..5011f72 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -807,7 +807,7 @@ SkBitmap Browser::GetCurrentPageIcon() const { TabContents* contents = GetSelectedTabContents(); // |contents| can be NULL since GetCurrentPageIcon() is called by the window // during the window's creation (before tabs have been added). - return contents ? contents->GetFavIcon() : SkBitmap(); + return contents ? contents->GetFavicon() : SkBitmap(); } string16 Browser::GetWindowTitleForCurrentTab() const { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index ac05aff..0b9202d 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -509,7 +509,7 @@ void RecordAppLaunch(Profile* profile, GURL url) { if (node->is_folder()) return folderImage_; - const SkBitmap& favIcon = bookmarkModel_->GetFavIcon(node); + const SkBitmap& favIcon = bookmarkModel_->GetFavicon(node); if (!favIcon.isNull()) return gfx::SkBitmapToNSImage(favIcon); diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index 510d09b..06b8903 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -275,7 +275,7 @@ void BookmarkMenuBridge::ConfigureMenuItem(const BookmarkNode* node, NSImage* favicon = nil; BookmarkModel* model = GetBookmarkModel(); if (model) { - const SkBitmap& bitmap = model->GetFavIcon(node); + const SkBitmap& bitmap = model->GetFavicon(node); if (!bitmap.isNull()) favicon = gfx::SkBitmapToNSImage(bitmap); } diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 3142449..d82ce6a 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -381,7 +381,7 @@ void HistoryMenuBridge::OnVisitedHistoryResults( item->title = history_item->GetTitle(); item->url = history_item->GetURL(); if (history_item->HasFavIcon()) { - const SkBitmap* icon = history_item->GetFavIcon(); + const SkBitmap* icon = history_item->GetFavicon(); item->icon.reset([gfx::SkBitmapToNSImage(*icon) retain]); } else { GetFaviconForHistoryItem(item); diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index 031d1d5..5a9e2a8 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm @@ -146,7 +146,7 @@ HungRendererController* g_instance = NULL; // TabContents can return a null SkBitmap if it has no favicon. If this // happens, use the default favicon. - const SkBitmap& bitmap = it->GetFavIcon(); + const SkBitmap& bitmap = it->GetFavicon(); if (!bitmap.isNull()) { [favicons addObject:gfx::SkBitmapToNSImage(bitmap)]; } else { diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 4c1bd3c..aa56b6c 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h @@ -134,7 +134,7 @@ class LocationBarViewMac : public AutocompleteEditController, virtual void OnInputInProgress(bool in_progress); virtual void OnKillFocus(); virtual void OnSetFocus(); - virtual SkBitmap GetFavIcon() const; + virtual SkBitmap GetFavicon() const; virtual string16 GetTitle() const; virtual InstantController* GetInstant(); virtual TabContentsWrapper* GetTabContentsWrapper(); diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 2049fc0..61b12fd 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -273,7 +273,7 @@ void LocationBarViewMac::OnKillFocus() { // Do nothing. } -SkBitmap LocationBarViewMac::GetFavIcon() const { +SkBitmap LocationBarViewMac::GetFavicon() const { NOTIMPLEMENTED(); return SkBitmap(); } diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index 55b7d8f..dd98aab 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -494,7 +494,7 @@ SkBitmap Tile::favicon() const { if (icon) return *icon; } - return contents_->GetFavIcon(); + return contents_->GetFavicon(); } NSRect Tile::GetTitleStartRectRelativeTo(const Tile& tile) const { diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index b3c9842..d23fa87 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -1224,7 +1224,7 @@ private: if (icon) image = gfx::SkBitmapToNSImageWithColorSpace(*icon, colorSpace); } else { - image = gfx::SkBitmapToNSImageWithColorSpace(contents->GetFavIcon(), + image = gfx::SkBitmapToNSImageWithColorSpace(contents->GetFavicon(), colorSpace); } diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc index 3f99f84..ae6f3da 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc @@ -162,8 +162,8 @@ GdkPixbuf* GetPixbufForNode(const BookmarkNode* node, BookmarkModel* model, GdkPixbuf* pixbuf; if (node->is_url()) { - if (model->GetFavIcon(node).width() != 0) { - pixbuf = gfx::GdkPixbufFromSkBitmap(&model->GetFavIcon(node)); + if (model->GetFavicon(node).width() != 0) { + pixbuf = gfx::GdkPixbufFromSkBitmap(&model->GetFavicon(node)); } else { pixbuf = GtkThemeProvider::GetDefaultFavicon(native); g_object_ref(pixbuf); diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc index 4a4d0f7..15bffcd 100644 --- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc @@ -153,7 +153,7 @@ void HungRendererDialogGtk::ShowForTabContents(TabContents* hung_contents) { std::string title = UTF16ToUTF8(it->GetTitle()); if (title.empty()) title = UTF16ToUTF8(TabContentsWrapper::GetDefaultTitle()); - SkBitmap favicon = it->GetFavIcon(); + SkBitmap favicon = it->GetFavicon(); GdkPixbuf* pixbuf = NULL; if (favicon.width() > 0) diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index e314fe3..a9fbd9b 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -559,8 +559,8 @@ void LocationBarViewGtk::OnSetFocus() { OnChanged(); } -SkBitmap LocationBarViewGtk::GetFavIcon() const { - return GetTabContents()->GetFavIcon(); +SkBitmap LocationBarViewGtk::GetFavicon() const { + return GetTabContents()->GetFavicon(); } string16 LocationBarViewGtk::GetTitle() const { @@ -1086,7 +1086,7 @@ void LocationBarViewGtk::OnIconDragData(GtkWidget* sender, void LocationBarViewGtk::OnIconDragBegin(GtkWidget* sender, GdkDragContext* context) { - SkBitmap favicon = GetFavIcon(); + SkBitmap favicon = GetFavicon(); GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&favicon); if (!pixbuf) return; diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h index a5b38cd..a888524 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.h +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h @@ -101,7 +101,7 @@ class LocationBarViewGtk : public AutocompleteEditController, virtual void OnKillFocus() OVERRIDE; virtual void OnSetFocus() OVERRIDE; virtual void OnInputInProgress(bool in_progress) OVERRIDE; - virtual SkBitmap GetFavIcon() const OVERRIDE; + virtual SkBitmap GetFavicon() const OVERRIDE; virtual string16 GetTitle() const OVERRIDE; virtual InstantController* GetInstant() OVERRIDE; virtual TabContentsWrapper* GetTabContentsWrapper() OVERRIDE; diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc index af4191f..1ae69ab4 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc @@ -296,7 +296,7 @@ void TabRendererGtk::UpdateData(TabContents* contents, if (app_icon) data_.favicon = *app_icon; else - data_.favicon = contents->GetFavIcon(); + data_.favicon = contents->GetFavicon(); data_.app = app; // This is kind of a hacky way to determine whether our icon is the default diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index d01370b..69a0d82 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -1265,8 +1265,8 @@ void BookmarkBarView::ConfigureButton(const BookmarkNode* node, button->SetContextMenuController(this); button->SetDragController(this); if (node->is_url()) { - if (model_->GetFavIcon(node).width() != 0) - button->SetIcon(model_->GetFavIcon(node)); + if (model_->GetFavicon(node).width() != 0) + button->SetIcon(model_->GetFavicon(node)); else button->SetIcon(*kDefaultFavIcon); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index 3597fa1..14ed82f 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -292,7 +292,7 @@ void BookmarkMenuController::BookmarkNodeFavIconLoaded( i != node_to_menu_map_.end(); ++i) { MenuItemView* menu_item = i->second->GetMenuItemByID(menu_pair->second); if (menu_item) { - menu_item->SetIcon(model->GetFavIcon(node)); + menu_item->SetIcon(model->GetFavicon(node)); return; } } @@ -334,7 +334,7 @@ void BookmarkMenuController::BuildMenu(const BookmarkNode* parent, (*next_menu_id)++; if (node->is_url()) { - SkBitmap icon = profile_->GetBookmarkModel()->GetFavIcon(node); + SkBitmap icon = profile_->GetBookmarkModel()->GetFavicon(node); if (icon.width() == 0) { icon = *ResourceBundle::GetSharedInstance(). GetBitmapNamed(IDR_DEFAULT_FAVICON); diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index 8c41726..acea226 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -104,7 +104,7 @@ string16 HungPagesTableModel::GetText(int row, int column_id) { SkBitmap HungPagesTableModel::GetIcon(int row) { DCHECK(row >= 0 && row < RowCount()); - return tab_contentses_.at(row)->GetFavIcon(); + return tab_contentses_.at(row)->GetFavicon(); } void HungPagesTableModel::SetObserver(ui::TableModelObserver* observer) { diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 29cba84..68b535e 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -805,8 +805,8 @@ void LocationBarView::OnSetFocus() { focus_manager->SetFocusedView(this); } -SkBitmap LocationBarView::GetFavIcon() const { - return GetTabContentsFromDelegate(delegate_)->GetFavIcon(); +SkBitmap LocationBarView::GetFavicon() const { + return GetTabContentsFromDelegate(delegate_)->GetFavicon(); } string16 LocationBarView::GetTitle() const { @@ -1023,7 +1023,7 @@ void LocationBarView::WriteDragDataForView(views::View* sender, DCHECK(tab_contents); drag_utils::SetURLAndDragImage(tab_contents->GetURL(), UTF16ToWideHack(tab_contents->GetTitle()), - tab_contents->GetFavIcon(), data); + tab_contents->GetFavicon(), data); } int LocationBarView::GetDragOperationsForView(views::View* sender, diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index ff3c7f8b..373e6f9 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -196,7 +196,7 @@ class LocationBarView : public LocationBar, virtual void OnInputInProgress(bool in_progress) OVERRIDE; virtual void OnKillFocus() OVERRIDE; virtual void OnSetFocus() OVERRIDE; - virtual SkBitmap GetFavIcon() const OVERRIDE; + virtual SkBitmap GetFavicon() const OVERRIDE; virtual string16 GetTitle() const OVERRIDE; virtual InstantController* GetInstant() OVERRIDE; virtual TabContentsWrapper* GetTabContentsWrapper() OVERRIDE; diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 2b1d930..9ab32bd 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -391,7 +391,7 @@ void BrowserTabStripController::SetTabRendererDataFromModel( if (app_icon) data->favicon = *app_icon; else - data->favicon = contents->GetFavIcon(); + data->favicon = contents->GetFavicon(); data->network_state = TabContentsNetworkState(contents); data->title = contents->GetTitle(); data->loading = contents->is_loading(); diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index d2da2ca..4ca7fa3 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -789,7 +789,7 @@ void GetShortcutInfoForTab(TabContents* tab_contents, tab_contents->GetTitle()) : app_info.title; info->description = app_info.description; - info->favicon = tab_contents->GetFavIcon(); + info->favicon = tab_contents->GetFavicon(); } void UpdateShortcutForTabContents(TabContents* tab_contents) { diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc index 4278b0f..05a2481 100644 --- a/chrome/test/live_sync/bookmark_model_verifier.cc +++ b/chrome/test/live_sync/bookmark_model_verifier.cc @@ -48,7 +48,7 @@ class FaviconLoadObserver : public BookmarkModelObserver { virtual void BookmarkNodeChanged(BookmarkModel* model, const BookmarkNode* node) { if (model == model_ && node == node_) - model->GetFavIcon(node); + model->GetFavicon(node); } virtual void BookmarkNodeChildrenReordered(BookmarkModel* model, const BookmarkNode* node) {} @@ -106,8 +106,8 @@ bool BookmarkModelVerifier::ModelsMatch(BookmarkModel* model_a, EXPECT_TRUE(iterator_b.has_next()); const BookmarkNode* node_b = iterator_b.Next(); ret_val = ret_val && NodesMatch(node_a, node_b); - const SkBitmap& bitmap_a = model_a->GetFavIcon(node_a); - const SkBitmap& bitmap_b = model_b->GetFavIcon(node_b); + const SkBitmap& bitmap_a = model_a->GetFavicon(node_a); + const SkBitmap& bitmap_b = model_b->GetFavicon(node_b); ret_val = ret_val && FaviconsMatch(bitmap_a, bitmap_b); } ret_val = ret_val && (!iterator_b.has_next()); diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index ad38eed..b4900ac 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -575,7 +575,7 @@ bool TabContents::ShouldDisplayURL() { return true; } -SkBitmap TabContents::GetFavIcon() const { +SkBitmap TabContents::GetFavicon() const { // Like GetTitle(), we also want to use the favicon for the last committed // entry rather than a pending navigation entry. NavigationEntry* entry = controller_.GetTransientEntry(); diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index ae7b865..169b172 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -243,7 +243,7 @@ class TabContents : public PageNavigator, // Returns the favicon for this tab, or an isNull() bitmap if the tab does not // have a favicon. The default implementation uses the current navigation // entry. - SkBitmap GetFavIcon() const; + SkBitmap GetFavicon() const; // Returns true if we are not using the default favicon. bool FavIconIsValid() const; |