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/chromeos/volume_bubble.h | |
| 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/chromeos/volume_bubble.h')
| -rw-r--r-- | chrome/browser/chromeos/volume_bubble.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/volume_bubble.h b/chrome/browser/chromeos/volume_bubble.h index 9d0ee57..a99ae2c 100644 --- a/chrome/browser/chromeos/volume_bubble.h +++ b/chrome/browser/chromeos/volume_bubble.h @@ -6,17 +6,16 @@ #define CHROME_BROWSER_CHROMEOS_VOLUME_BUBBLE_H_ #pragma once -#include "base/singleton.h" #include "chrome/browser/chromeos/setting_level_bubble.h" +template <typename T> struct DefaultSingletonTraits; + namespace chromeos { // Singleton class controlling volume bubble. class VolumeBubble : public SettingLevelBubble { public: - static VolumeBubble* instance() { - return Singleton<VolumeBubble>::get(); - } + static VolumeBubble* instance(); private: friend struct DefaultSingletonTraits<VolumeBubble>; |