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_window_gtk.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_window_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index f0462e5..25c8f12 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -663,7 +663,7 @@ void BrowserWindowGtk::Close() { if (accel_group_) { // Disconnecting the keys we connected to our accelerator group frees the // closures allocated in ConnectAccelerators. - AcceleratorsGtk* accelerators = Singleton<AcceleratorsGtk>().get(); + AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance(); for (AcceleratorsGtk::const_iterator iter = accelerators->begin(); iter != accelerators->end(); ++iter) { gtk_accel_group_disconnect_key(accel_group_, @@ -1721,7 +1721,7 @@ void BrowserWindowGtk::ConnectAccelerators() { accel_group_ = gtk_accel_group_new(); gtk_window_add_accel_group(window_, accel_group_); - AcceleratorsGtk* accelerators = Singleton<AcceleratorsGtk>().get(); + AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance(); for (AcceleratorsGtk::const_iterator iter = accelerators->begin(); iter != accelerators->end(); ++iter) { gtk_accel_group_connect( |