Make members of Singleton<T> private and only visible to the singleton type.

views/focus/focus_manager.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 "views/focus/focus_manager.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 
@@ skipping 45 matching lines @@
 
   // Perform a safe iteration over the focus listeners, as the array of
   // may change during notification.
   WidgetFocusChangeListenerList local_listeners(focus_change_listeners_);
   WidgetFocusChangeListenerList::iterator iter(local_listeners.begin());
   for (;iter != local_listeners.end(); ++iter) {
     (*iter)->NativeFocusWillChange(focused_before, focused_now);
   }
 }
 
+// static
+FocusManager::WidgetFocusManager*
+FocusManager::WidgetFocusManager::GetInstance() {
+  return Singleton<WidgetFocusManager>::get();
+}
+
 // FocusManager -----------------------------------------------------
 
 FocusManager::FocusManager(Widget* widget)
     : widget_(widget),
       focused_view_(NULL),
       focus_change_reason_(kReasonDirectFocusChange) {
   DCHECK(widget_);
   stored_focused_view_storage_id_ =
       ViewStorage::GetInstance()->CreateStorageID();
 }
 
 FocusManager::~FocusManager() {
   // If there are still registered FocusChange listeners, chances are they were
   // leaked so warn about them.
   DCHECK(focus_change_listeners_.empty());
 }
 
 // static
 FocusManager::WidgetFocusManager* FocusManager::GetWidgetFocusManager() {
-  return Singleton<WidgetFocusManager>::get();
+  return WidgetFocusManager::GetInstance();
 }
 
 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.
   // On Linux we always dispatch key events to the focused view first, so
   // we should not do this check here. See also WidgetGtk::OnKeyEvent().
   if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event))
     return true;
 #endif
@@ skipping 428 matching lines @@
       std::find(focus_change_listeners_.begin(), focus_change_listeners_.end(),
                 listener);
   if (place == focus_change_listeners_.end()) {
     NOTREACHED() << "Removing a listener that isn't registered.";
     return;
   }
   focus_change_listeners_.erase(place);
 }
 
 }  // namespace views