diff options
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r-- | chrome/browser/chromeos/wm_overview_controller.cc | 4 | ||||
-rw-r--r-- | chrome/browser/chromeos/wm_overview_fav_icon.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/wm_overview_fav_icon.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/wm_overview_controller.cc b/chrome/browser/chromeos/wm_overview_controller.cc index e79d360..656a077 100644 --- a/chrome/browser/chromeos/wm_overview_controller.cc +++ b/chrome/browser/chromeos/wm_overview_controller.cc @@ -238,7 +238,7 @@ void BrowserListener::TabChangedAt( if (change_type != TabStripModelObserver::LOADING_ONLY) { snapshots_[index].title->SetTitle(contents->tab_contents()->GetTitle()); snapshots_[index].title->SetUrl(contents->tab_contents()->GetURL()); - snapshots_[index].fav_icon->SetFavIcon( + snapshots_[index].fav_icon->SetFavicon( 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/chromeos/wm_overview_fav_icon.cc b/chrome/browser/chromeos/wm_overview_fav_icon.cc index 31fcafb..0b98fe1 100644 --- a/chrome/browser/chromeos/wm_overview_fav_icon.cc +++ b/chrome/browser/chromeos/wm_overview_fav_icon.cc @@ -51,7 +51,7 @@ void WmOverviewFavIcon::Init(WmOverviewSnapshot* snapshot) { } -void WmOverviewFavIcon::SetFavIcon(const SkBitmap& image) { +void WmOverviewFavIcon::SetFavicon(const SkBitmap& image) { CHECK(fav_icon_view_) << "Init not called before setting favicon."; SkBitmap icon; if (image.width() && image.height()) { diff --git a/chrome/browser/chromeos/wm_overview_fav_icon.h b/chrome/browser/chromeos/wm_overview_fav_icon.h index 40f75b7..9edbe099 100644 --- a/chrome/browser/chromeos/wm_overview_fav_icon.h +++ b/chrome/browser/chromeos/wm_overview_fav_icon.h @@ -30,7 +30,7 @@ class WmOverviewFavIcon : public views::WidgetGtk { // Setting the favicon sets the bounds to the size of the given // image. - void SetFavIcon(const SkBitmap& image); + void SetFavicon(const SkBitmap& image); private: // This control is the contents view for this widget. |