diff options
| author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 16:42:15 +0000 |
|---|---|---|
| committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 16:42:15 +0000 |
| commit | fee46a89f493080db0838e2314b4400faeec94f3 (patch) | |
| tree | 6e857fcf0b6b548b526c45d24879ad6422d50856 /chrome/browser/gtk/browser_titlebar.cc | |
| parent | f2d1f61006eac0f8a051fa485b2cffb6b6fa74e0 (diff) | |
| download | chromium_src-fee46a89f493080db0838e2314b4400faeec94f3.zip chromium_src-fee46a89f493080db0838e2314b4400faeec94f3.tar.gz chromium_src-fee46a89f493080db0838e2314b4400faeec94f3.tar.bz2 | |
This is a continuation of http://codereview.chromium.org/5519016/, adds a new GetInstance() method for remaining files with singleton classes under chrome/browser.
For types declared and used within the same .cc file, I changed them over to LazyInstance<T>.
BUG=65298
TEST=all existing tests should continue to pass.
Review URL: http://codereview.chromium.org/5711001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_titlebar.cc')
| -rw-r--r-- | chrome/browser/gtk/browser_titlebar.cc | 6 |
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; |