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

Unified Diff: chrome/browser/ui/views/toolbar_view.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 | « chrome/browser/ui/views/tab_contents/tab_contents_view_win.cc ('k') | chrome/common/child_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 73a4be375589baf53a628876022e32b2432735ea..7044ec24149a77c8245bb44b4a15d55c7b1efe9b 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -355,7 +355,7 @@ cleanup:
destroyed_flag_ = NULL;
// Stop showing the background app badge also.
- BackgroundPageTracker::GetSingleton()->AcknowledgeBackgroundPages();
+ BackgroundPageTracker::GetInstance()->AcknowledgeBackgroundPages();
}
////////////////////////////////////////////////////////////////////////////////
@@ -633,13 +633,13 @@ bool ToolbarView::IsUpgradeRecommended() {
}
bool ToolbarView::ShouldShowBackgroundPageBadge() {
- return BackgroundPageTracker::GetSingleton()->
+ return BackgroundPageTracker::GetInstance()->
GetUnacknowledgedBackgroundPageCount() > 0;
}
bool ToolbarView::ShouldShowIncompatibilityWarning() {
#if defined(OS_WIN)
- EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetSingleton();
+ EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetInstance();
return loaded_modules->confirmed_bad_modules_detected() > 0;
#else
return false;
@@ -761,7 +761,7 @@ SkBitmap ToolbarView::GetBackgroundPageBadge() {
ThemeProvider* tp = GetThemeProvider();
SkBitmap* badge = tp->GetBitmapNamed(IDR_BACKGROUND_BADGE);
string16 badge_text = base::FormatNumber(
- BackgroundPageTracker::GetSingleton()->GetBackgroundPageCount());
+ BackgroundPageTracker::GetInstance()->GetBackgroundPageCount());
return badge_util::DrawBadgeIconOverlay(
*badge,
kBadgeTextFontSize,
« no previous file with comments | « chrome/browser/ui/views/tab_contents/tab_contents_view_win.cc ('k') | chrome/common/child_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698