summaryrefslogtreecommitdiffstats
path: root/chrome/browser/accessibility
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-09 16:42:15 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-09 16:42:15 +0000
commitfee46a89f493080db0838e2314b4400faeec94f3 (patch)
tree6e857fcf0b6b548b526c45d24879ad6422d50856 /chrome/browser/accessibility
parentf2d1f61006eac0f8a051fa485b2cffb6b6fa74e0 (diff)
downloadchromium_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/accessibility')
-rw-r--r--chrome/browser/accessibility/browser_accessibility_state.cc7
-rw-r--r--chrome/browser/accessibility/browser_accessibility_state.h6
2 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/accessibility/browser_accessibility_state.cc b/chrome/browser/accessibility/browser_accessibility_state.cc
index 83f81f9..a6967c8 100644
--- a/chrome/browser/accessibility/browser_accessibility_state.cc
+++ b/chrome/browser/accessibility/browser_accessibility_state.cc
@@ -3,6 +3,8 @@
// found in the LICENSE file.
#include "chrome/browser/accessibility/browser_accessibility_state.h"
+
+#include "base/singleton.h"
#include "chrome/browser/profiles/profile.h"
BrowserAccessibilityState::BrowserAccessibilityState()
@@ -12,6 +14,11 @@ BrowserAccessibilityState::BrowserAccessibilityState()
BrowserAccessibilityState::~BrowserAccessibilityState() {
}
+// static
+BrowserAccessibilityState* BrowserAccessibilityState::GetInstance() {
+ return Singleton<BrowserAccessibilityState>::get();
+}
+
void BrowserAccessibilityState::OnScreenReaderDetected() {
screen_reader_active_ = true;
}
diff --git a/chrome/browser/accessibility/browser_accessibility_state.h b/chrome/browser/accessibility/browser_accessibility_state.h
index efcd2dd..bdd7bcc 100644
--- a/chrome/browser/accessibility/browser_accessibility_state.h
+++ b/chrome/browser/accessibility/browser_accessibility_state.h
@@ -7,7 +7,8 @@
#pragma once
#include "base/basictypes.h"
-#include "base/singleton.h"
+
+template <typename T> struct DefaultSingletonTraits;
// The BrowserAccessibilityState class is used to determine if Chrome should be
// customized for users with assistive technology, such as screen readers. We
@@ -25,6 +26,9 @@
// file for Universal Access with the key "voiceOverOnOffKey".
class BrowserAccessibilityState {
public:
+ // Returns the singleton instance.
+ static BrowserAccessibilityState* GetInstance();
+
~BrowserAccessibilityState();
// Called when screen reader client is detected.