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

This is a small step towards making all singleton classes use the Singleton<T> pattern within their code and not expect the callers to know about it.

This CL includes all files except those under chrome/browser, chrome/net, chrome/service and third_party/WebKit (these will be done in future CLs).

Suggested files to focus for reviewers:
- joi@ for files under src/ceee
- tommi@ for files under src/chrome_frame
- maruel@ for the rest of the files.

BUG=65298
TEST=all existing tests should continue to pass.

Review URL: http://codereview.chromium.org/5581008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68577 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 3 deletions

diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index 2007ff1..4848e4b 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -80,6 +80,11 @@ FocusManager::~FocusManager() {
   DCHECK(focus_change_listeners_.empty());
 }
 
+// static
+FocusManager::WidgetFocusManager* FocusManager::GetWidgetFocusManager() {
+  return Singleton<WidgetFocusManager>::get();
+}
+
 bool FocusManager::OnKeyEvent(const KeyEvent& event) {
 #if defined(OS_WIN)
   // If the focused view wants to process the key event as is, let it be.
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index af6f414..28f97b4 100644
--- a/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.h
@@ -176,9 +176,7 @@ class FocusManager {
   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