summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-11 09:13:54 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-11 09:13:54 +0000
commit49ab556cfe14de363a74ce771931832304a1a038 (patch)
tree7703457c54a035f2eebe38babecaba12b6bfb975 /views
parent0310169705d607a78bc288e74038fe104b4474fd (diff)
downloadchromium_src-49ab556cfe14de363a74ce771931832304a1a038.zip
chromium_src-49ab556cfe14de363a74ce771931832304a1a038.tar.gz
chromium_src-49ab556cfe14de363a74ce771931832304a1a038.tar.bz2
Make members of Singleton<T> private and only visible to the singleton type. This enforces that the Singleton<T> pattern can only be used within classes which want singleton-ness.
As part of this CL I have also fixed up files which got missed in my previous CLs to use a GetInstance() method and use Singleton<T> from the source file. There are a small number of places where I have also switched to LazyInstance as that was more appropriate for types used in a single source file. BUG=65298 TEST=all existing tests should continue to pass. Review URL: http://codereview.chromium.org/5682008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/focus/focus_manager.cc8
-rw-r--r--views/focus/focus_manager.h3
2 files changed, 10 insertions, 1 deletions
diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index 4848e4b..e8a3e7e 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -63,6 +63,12 @@ void FocusManager::WidgetFocusManager::OnWidgetFocusEvent(
}
}
+// static
+FocusManager::WidgetFocusManager*
+FocusManager::WidgetFocusManager::GetInstance() {
+ return Singleton<WidgetFocusManager>::get();
+}
+
// FocusManager -----------------------------------------------------
FocusManager::FocusManager(Widget* widget)
@@ -82,7 +88,7 @@ FocusManager::~FocusManager() {
// static
FocusManager::WidgetFocusManager* FocusManager::GetWidgetFocusManager() {
- return Singleton<WidgetFocusManager>::get();
+ return WidgetFocusManager::GetInstance();
}
bool FocusManager::OnKeyEvent(const KeyEvent& event) {
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 28f97b4..6eee79d 100644
--- a/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.h
@@ -126,6 +126,9 @@ class FocusManager {
public:
class WidgetFocusManager {
public:
+ // Returns the singleton instance.
+ static WidgetFocusManager* GetInstance();
+
// Adds/removes a WidgetFocusChangeListener |listener| to the set of
// active listeners.
void AddFocusChangeListener(WidgetFocusChangeListener* listener);