Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: views/focus/focus_manager.cc

Issue 5685007: Rename all methods accessing Singleton<T> as GetInstance(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/focus/external_focus_tracker.cc ('k') | views/focus/view_storage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/focus/focus_manager.cc
diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index 4848e4bda075601adc7f3b11cdeddd204d62bd4a..5e869ad56919cc363fcb1e622e69f34903a50ed1 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -71,7 +71,7 @@ FocusManager::FocusManager(Widget* widget)
focus_change_reason_(kReasonDirectFocusChange) {
DCHECK(widget_);
stored_focused_view_storage_id_ =
- ViewStorage::GetSharedInstance()->CreateStorageID();
+ ViewStorage::GetInstance()->CreateStorageID();
}
FocusManager::~FocusManager() {
@@ -332,7 +332,7 @@ void FocusManager::ClearFocus() {
}
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();
@@ -365,7 +365,7 @@ void FocusManager::StoreFocusedView() {
}
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();
@@ -399,7 +399,7 @@ void FocusManager::RestoreFocusedView() {
}
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();
« no previous file with comments | « views/focus/external_focus_tracker.cc ('k') | views/focus/view_storage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698