fav icon -> favicon. Pass 5: fav_icon -> favicon

chrome/browser/chromeos/wm_overview_controller.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/chromeos/wm_overview_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/linked_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
-#include "chrome/browser/chromeos/wm_overview_fav_icon.h"
+#include "chrome/browser/chromeos/wm_overview_favicon.h"
 #include "chrome/browser/chromeos/wm_overview_snapshot.h"
 #include "chrome/browser/chromeos/wm_overview_title.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
@@ skipping 134 matching lines @@
   // Which renderer host we are working on.
   RenderWidgetHost* current_renderer_host_; // Not owned
 
   // Widgets containing snapshot images for this browser.  Note that
   // these are all subclasses of WidgetGtk, and they are all added to
   // parents, so they will be deleted by the parents when they are
   // closed.
   struct SnapshotNode {
     WmOverviewSnapshot* snapshot;  // Not owned
     WmOverviewTitle* title;  // Not owned
-    WmOverviewFavIcon* fav_icon;  // Not owned
+    WmOverviewFavicon* favicon;  // Not owned
   };
   typedef std::vector<SnapshotNode> SnapshotVector;
   SnapshotVector snapshots_;
 
   // Non-zero if we are currently setting the tab from within SelectTab.
   // This is used to make sure we use the right timestamp when sending
   // property changes that originated from the window manager.
   uint32 select_tab_timestamp_;
 
   // The tab selected the last time SaveCurrentTab is called.
@@ skipping 52 matching lines @@
   UpdateSelectedIndex(browser_->selected_index());
 }
 
 void BrowserListener::TabChangedAt(
     TabContentsWrapper* contents,
     int index,
     TabStripModelObserver::TabChangeType change_type) {
   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].favicon->SetFavicon(
         contents->tab_contents()->GetFavicon());
     if (change_type != TabStripModelObserver::TITLE_NOT_LOADING)
       MarkSnapshotAsDirty(index);
   }
 }
 
 void BrowserListener::TabStripEmpty() {
   snapshots_.clear();
 }
 
@@ skipping 57 matching lines @@
   }
 }
 
 void BrowserListener::ShowSnapshots() {
   for (SnapshotVector::size_type i = 0; i < snapshots_.size(); ++i) {
     const SnapshotNode& node = snapshots_[i];
     if (!node.snapshot->IsVisible())
       node.snapshot->Show();
     if (!snapshots_[i].title->IsVisible())
       node.title->Show();
-    if (!snapshots_[i].fav_icon->IsVisible())
-      node.fav_icon->Show();
+    if (!snapshots_[i].favicon->IsVisible())
+      node.favicon->Show();
   }
 }
 
 void BrowserListener::SelectTab(int index, uint32 timestamp) {
   // Ignore requests to switch to non-existent tabs (the window manager gets
   // notified asynchronously about the number of tabs in each window, so there's
   // no guarantee that the messages that it sends us will make sense).
   if (index < 0 || index >= browser_->tab_count())
     return;
 
@@ skipping 84 matching lines @@
     controller_->StartDelayTimer();
   }
 }
 
 void BrowserListener::InsertSnapshot(int index) {
   SnapshotNode node;
   node.snapshot = new WmOverviewSnapshot;
   gfx::Size cell_size = CalculateCellSize();
   node.snapshot->Init(cell_size, browser_, index);
 
-  node.fav_icon = new WmOverviewFavIcon;
-  node.fav_icon->Init(node.snapshot);
-  node.fav_icon->SetFavicon(browser_->GetTabContentsAt(index)->GetFavicon());
+  node.favicon = new WmOverviewFavicon;
+  node.favicon->Init(node.snapshot);
+  node.favicon->SetFavicon(browser_->GetTabContentsAt(index)->GetFavicon());
 
   node.title = new WmOverviewTitle;
   node.title->Init(gfx::Size(std::max(0, cell_size.width() -
-                                      WmOverviewFavIcon::kIconSize -
+                                      WmOverviewFavicon::kIconSize -
                                       kFavIconPadding),
                              kTitleHeight), node.snapshot);
   node.title->SetTitle(browser_->GetTabContentsAt(index)->GetTitle());
 
   snapshots_.insert(snapshots_.begin() + index, node);
   node.snapshot->reload_snapshot();
   controller_->UpdateSnapshots();
 }
 
 // Removes the snapshot at index.
 void BrowserListener::ClearSnapshot(int index) {
   snapshots_[index].snapshot->CloseNow();
   snapshots_[index].title->CloseNow();
-  snapshots_[index].fav_icon->CloseNow();
+  snapshots_[index].favicon->CloseNow();
   snapshots_.erase(snapshots_.begin() + index);
 }
 
 void BrowserListener::RenumberSnapshots(int start_index) {
   for (SnapshotVector::size_type i = start_index; i < snapshots_.size(); ++i) {
     if (snapshots_[i].snapshot->index() != static_cast<int>(i))
       snapshots_[i].snapshot->UpdateIndex(browser_, i);
   }
 }
 
@@ skipping 282 matching lines @@
     if (item.get() == NULL) {
       item = BrowserListenerVector::value_type(
           new BrowserListener(*iterator, this));
     }
     listeners_.push_back(item);
     ++iterator;
   }
 }
 
 }  // namespace chromeos