summaryrefslogtreecommitdiffstats
path: root/views/focus
diff options
context:
space:
mode:
Diffstat (limited to 'views/focus')
-rw-r--r--views/focus/focus_manager.cc8
-rw-r--r--views/focus/focus_manager.h3
2 files changed, 1 insertions, 10 deletions
diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index e8a3e7e..4848e4b 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -63,12 +63,6 @@ void FocusManager::WidgetFocusManager::OnWidgetFocusEvent(
}
}
-// static
-FocusManager::WidgetFocusManager*
-FocusManager::WidgetFocusManager::GetInstance() {
- return Singleton<WidgetFocusManager>::get();
-}
-
// FocusManager -----------------------------------------------------
FocusManager::FocusManager(Widget* widget)
@@ -88,7 +82,7 @@ FocusManager::~FocusManager() {
// static
FocusManager::WidgetFocusManager* FocusManager::GetWidgetFocusManager() {
- return WidgetFocusManager::GetInstance();
+ return Singleton<WidgetFocusManager>::get();
}
bool FocusManager::OnKeyEvent(const KeyEvent& event) {
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 6eee79d..28f97b4 100644
--- a/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.h
@@ -126,9 +126,6 @@ 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);