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

Unified Diff: chrome/browser/gtk/browser_titlebar.cc

Issue 5711001: Add a new GetInstance() method for remaining files with singleton classes under chrome/browser. (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
Index: chrome/browser/gtk/browser_titlebar.cc
diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc
index 0e7e290a2afc573f68d971cefe1e6db2545ad4dd..7af5a5e3496868b580a5535142544c575e4894da 100644
--- a/chrome/browser/gtk/browser_titlebar.cc
+++ b/chrome/browser/gtk/browser_titlebar.cc
@@ -307,7 +307,7 @@ void BrowserTitlebar::Init() {
#if defined(USE_GCONF)
// Either read the gconf database and register for updates (on GNOME), or use
// the default value (anywhere else).
- Singleton<GConfTitlebarListener>()->SetTitlebarButtons(this);
+ GConfTitlebarListener::GetInstance()->SetTitlebarButtons(this);
#else
BuildButtons(kDefaultButtonString);
#endif
@@ -373,7 +373,7 @@ void BrowserTitlebar::Init() {
BrowserTitlebar::~BrowserTitlebar() {
ActiveWindowWatcherX::RemoveObserver(this);
#if defined(USE_GCONF)
- Singleton<GConfTitlebarListener>()->RemoveObserver(this);
+ GConfTitlebarListener::GetInstance()->RemoveObserver(this);
#endif
}
@@ -849,7 +849,7 @@ void BrowserTitlebar::ExecuteCommand(int command_id) {
bool BrowserTitlebar::GetAcceleratorForCommandId(
int command_id, menus::Accelerator* accelerator) {
const menus::AcceleratorGtk* accelerator_gtk =
- Singleton<AcceleratorsGtk>()->GetPrimaryAcceleratorForCommand(
+ AcceleratorsGtk::GetInstance()->GetPrimaryAcceleratorForCommand(
command_id);
if (accelerator_gtk)
*accelerator = *accelerator_gtk;

Powered by Google App Engine
This is Rietveld 408576698