Add a new GetInstance() method for singleton classes, take 2.

views/focus/focus_manager.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef VIEWS_FOCUS_FOCUS_MANAGER_H_
 #define VIEWS_FOCUS_FOCUS_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 158 matching lines @@
 
     // The focus changed due to a click or a shortcut to jump directly to
     // a particular view.
     kReasonDirectFocusChange
   };
 
   explicit FocusManager(Widget* widget);
   virtual ~FocusManager();
 
   // Returns the global WidgetFocusManager instance for the running application.
-  static WidgetFocusManager* GetWidgetFocusManager() {
-    return Singleton<WidgetFocusManager>::get();
-  }
+  static WidgetFocusManager* GetWidgetFocusManager();
 
   // Processes the passed key event for accelerators and tab traversal.
   // Returns false if the event has been consumed and should not be processed
   // further.
   bool OnKeyEvent(const KeyEvent& event);
 
   // Returns true is the specified is part of the hierarchy of the window
   // associated with this FocusManager.
   bool ContainsView(View* view);
 
@@ skipping 142 matching lines @@
   ~AutoNativeNotificationDisabler() {
     FocusManager::GetWidgetFocusManager()->EnableNotifications();
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(AutoNativeNotificationDisabler);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_FOCUS_FOCUS_MANAGER_H_