summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/browser_titlebar.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/gtk/browser_titlebar.cc')
-rw-r--r--chrome/browser/gtk/browser_titlebar.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc
index 0e7e290a2..7af5a5e 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;