Revert 68932 - Make members of Singleton<T> private and only visible to the singleton type. This enforces that the Singleton<T> pattern can only be used within classes which want singleton-ness.

As part of this CL I have also fixed up files which got missed in my previous CLs to use a GetInstance() method and use Singleton<T> from the source file.

There are a small number of places where I have also switched to LazyInstance as that was more appropriate for types used in a single source file.

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

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

TBR=satish@chromium.org
Review URL: http://codereview.chromium.org/5721005

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

2 files changed, 1 insertions, 10 deletions

diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index e8a3e7e..4848e4b 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -63,12 +63,6 @@ void FocusManager::WidgetFocusManager::OnWidgetFocusEvent(
   }
 }
 
-// static
-FocusManager::WidgetFocusManager*
-FocusManager::WidgetFocusManager::GetInstance() {
-  return Singleton<WidgetFocusManager>::get();
-}
-
 // FocusManager -----------------------------------------------------
 
 FocusManager::FocusManager(Widget* widget)
@@ -88,7 +82,7 @@ FocusManager::~FocusManager() {
 
 // static
 FocusManager::WidgetFocusManager* FocusManager::GetWidgetFocusManager() {
-  return WidgetFocusManager::GetInstance();
+  return Singleton<WidgetFocusManager>::get();
 }
 
 bool FocusManager::OnKeyEvent(const KeyEvent& event) {
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 6eee79d..28f97b4 100644
--- a/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.h
@@ -126,9 +126,6 @@ class FocusManager {
  public:
   class WidgetFocusManager {
    public:
-    // Returns the singleton instance.
-    static WidgetFocusManager* GetInstance();
-
     // Adds/removes a WidgetFocusChangeListener |listener| to the set of
     // active listeners.
     void AddFocusChangeListener(WidgetFocusChangeListener* listener);