Continuation of CL 5685007, rename the singleton accessor method in more files.

chrome/browser/chromeos/wm_overview_controller.cc

 // Copyright (c) 2010 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"
@@ skipping 435 matching lines @@
   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);
   }
 }
 
 ///////////////////////////////////
 // WmOverviewController methods
 
 // static
-WmOverviewController* WmOverviewController::instance() {
+WmOverviewController* WmOverviewController::GetInstance() {
   static WmOverviewController* instance = NULL;
   if (!instance) {
     instance = Singleton<WmOverviewController>::get();
   }
   return instance;
 }
 
 WmOverviewController::WmOverviewController()
     : layout_mode_(ACTIVE_MODE),
       updating_snapshots_(false),
       browser_listener_index_(0),
       tab_contents_index_(-1) {
   AddAllBrowsers();
 
   if (registrar_.IsEmpty()) {
     // Make sure we get notifications for when the tab contents are
     // connected, so we know when a new browser has been created.
     registrar_.Add(this,
                    NotificationType::TAB_CONTENTS_CONNECTED,
                    NotificationService::AllSources());
 
     // Ask for notification when the snapshot source image has changed
     // and needs to be refreshed.
     registrar_.Add(this,
                    NotificationType::THUMBNAIL_GENERATOR_SNAPSHOT_CHANGED,
                    NotificationService::AllSources());
   }
 
   BrowserList::AddObserver(this);
-  WmMessageListener::instance()->AddObserver(this);
+  WmMessageListener::GetInstance()->AddObserver(this);
 }
 
 WmOverviewController::~WmOverviewController() {
-  WmMessageListener::instance()->RemoveObserver(this);
+  WmMessageListener::GetInstance()->RemoveObserver(this);
   BrowserList::RemoveObserver(this);
   listeners_.clear();
 }
 
 void WmOverviewController::Observe(NotificationType type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
   switch (type.value) {
     // Now that the tab contents are ready, we create the listeners
     // and snapshots for any new browsers out there.  This actually
@@ skipping 234 matching lines @@
     if (item.get() == NULL) {
       item = BrowserListenerVector::value_type(
           new BrowserListener(*iterator, this));
     }
     listeners_.push_back(item);
     ++iterator;
   }
 }
 
 }  // namespace chromeos