Rename all methods accessing Singleton<T> as GetInstance().

chrome_frame/chrome_frame_activex.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_frame/chrome_frame_activex.h"
 
 #include <wininet.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 19 matching lines @@
 #include "chrome_frame/utils.h"
 
 namespace {
 
 // Class used to maintain a mapping from top-level windows to ChromeFrameActivex
 // instances.
 class TopLevelWindowMapping {
  public:
   typedef std::vector<HWND> WindowList;
 
-  static TopLevelWindowMapping* instance() {
+  static TopLevelWindowMapping* GetInstance() {
     return Singleton<TopLevelWindowMapping>::get();
   }
 
   // Add |cf_window| to the set of windows registered under |top_window|.
   void AddMapping(HWND top_window, HWND cf_window) {
     top_window_map_lock_.Lock();
     top_window_map_[top_window].push_back(cf_window);
     top_window_map_lock_.Unlock();
   }
 
@@ skipping 25 matching lines @@
 // Chrome-Frame instances.
 LRESULT CALLBACK TopWindowProc(int code, WPARAM wparam, LPARAM lparam) {
   CWPSTRUCT *info = reinterpret_cast<CWPSTRUCT*>(lparam);
   const UINT &message = info->message;
   const HWND &message_hwnd = info->hwnd;
 
   switch (message) {
     case WM_MOVE:
     case WM_MOVING: {
       TopLevelWindowMapping::WindowList cf_instances =
-          TopLevelWindowMapping::instance()->GetInstances(message_hwnd);
+          TopLevelWindowMapping::GetInstance()->GetInstances(message_hwnd);
       TopLevelWindowMapping::WindowList::iterator
           iter(cf_instances.begin()), end(cf_instances.end());
       for (;iter != end; ++iter) {
         PostMessage(*iter, WM_HOST_MOVED_NOTIFICATION, NULL, NULL);
       }
       break;
     }
     default:
       break;
   }
@@ skipping 542 matching lines @@
     return hr;
 
   HWND parent_wnd;
   hr = ole_window->GetWindow(&parent_wnd);
   if (FAILED(hr))
     return hr;
 
   HWND top_window = ::GetAncestor(parent_wnd, GA_ROOT);
   chrome_wndproc_hook_ = InstallLocalWindowHook(top_window);
   if (chrome_wndproc_hook_)
-    TopLevelWindowMapping::instance()->AddMapping(top_window, m_hWnd);
+    TopLevelWindowMapping::GetInstance()->AddMapping(top_window, m_hWnd);
 
   return chrome_wndproc_hook_ ? S_OK : E_FAIL;
 }
 
 HRESULT ChromeFrameActivex::registerBhoIfNeeded() {
   if (!m_spUnkSite) {
     NOTREACHED() << "Invalid client site";
     return E_FAIL;
   }
 
@@ skipping 27 matching lines @@
   if (FAILED(hr)) {
     NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:"
                  << base::StringPrintf(" 0x%08X", hr);
     return hr;
   }
 
   web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string),
                             base::win::ScopedVariant(bho));
   return S_OK;
 }