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

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 53 matching lines @@
 }
 
 // FocusManager -----------------------------------------------------
 
 FocusManager::FocusManager(Widget* widget)
     : widget_(widget),
       focused_view_(NULL),
       focus_change_reason_(kReasonDirectFocusChange) {
   DCHECK(widget_);
   stored_focused_view_storage_id_ =
-      ViewStorage::GetSharedInstance()->CreateStorageID();
+      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() {
@@ skipping 240 matching lines @@
     }
   }
 }
 
 void FocusManager::ClearFocus() {
   SetFocusedView(NULL);
   ClearNativeFocus();
 }
 
 void FocusManager::StoreFocusedView() {
-  ViewStorage* view_storage = ViewStorage::GetSharedInstance();
+  ViewStorage* view_storage = ViewStorage::GetInstance();
   if (!view_storage) {
     // This should never happen but bug 981648 seems to indicate it could.
     NOTREACHED();
     return;
   }
 
   // TODO (jcampan): when a TabContents containing a popup is closed, the focus
   // is stored twice causing an assert. We should find a better alternative than
   // removing the view from the storage explicitly.
   view_storage->RemoveView(stored_focused_view_storage_id_);
@@ skipping 12 matching lines @@
     // is not changing due to a user-initiated event.
     AutoNativeNotificationDisabler local_notification_disabler;
     ClearFocus();
   }
 
   if (v)
     v->SchedulePaint();  // Remove focus border.
 }
 
 void FocusManager::RestoreFocusedView() {
-  ViewStorage* view_storage = ViewStorage::GetSharedInstance();
+  ViewStorage* view_storage = ViewStorage::GetInstance();
   if (!view_storage) {
     // This should never happen but bug 981648 seems to indicate it could.
     NOTREACHED();
     return;
   }
 
   View* view = view_storage->RetrieveView(stored_focused_view_storage_id_);
   if (view) {
     if (ContainsView(view)) {
       if (!view->IsFocusableInRootView() &&
@@ skipping 13 matching lines @@
       }
     }
   } else {
     // Clearing the focus will focus the root window, so we still get key
     // events.
     ClearFocus();
   }
 }
 
 void FocusManager::ClearStoredFocusedView() {
-  ViewStorage* view_storage = ViewStorage::GetSharedInstance();
+  ViewStorage* view_storage = ViewStorage::GetInstance();
   if (!view_storage) {
     // This should never happen but bug 981648 seems to indicate it could.
     NOTREACHED();
     return;
   }
   view_storage->RemoveView(stored_focused_view_storage_id_);
 }
 
 // Find the next (previous if reverse is true) focusable view for the specified
 // FocusTraversable, starting at the specified view, traversing down the
@@ skipping 111 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