summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-22 02:06:55 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-22 02:06:55 +0000
commitc0cfa519feb222571f5d046eb448aa422466bf45 (patch)
treee8297ba89b587b677a007f51665512a8e1a4a998 /chrome/browser/extensions
parent61176efeb97b4c36ff83abf71d611a9efbfc90e2 (diff)
downloadchromium_src-c0cfa519feb222571f5d046eb448aa422466bf45.zip
chromium_src-c0cfa519feb222571f5d046eb448aa422466bf45.tar.gz
chromium_src-c0cfa519feb222571f5d046eb448aa422466bf45.tar.bz2
Add experimental extensions APIs to notify about wakeup and screen unlock
BUG=chromium-os:20009 TEST=None Review URL: http://codereview.chromium.org/8558014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_accessibility_api.cc25
-rw-r--r--chrome/browser/extensions/extension_accessibility_api.h2
-rw-r--r--chrome/browser/extensions/extension_accessibility_api_constants.cc2
-rw-r--r--chrome/browser/extensions/extension_accessibility_api_constants.h2
4 files changed, 31 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_accessibility_api.cc b/chrome/browser/extensions/extension_accessibility_api.cc
index 731b81e..add11c0 100644
--- a/chrome/browser/extensions/extension_accessibility_api.cc
+++ b/chrome/browser/extensions/extension_accessibility_api.cc
@@ -65,6 +65,12 @@ ExtensionAccessibilityEventRouter::ExtensionAccessibilityEventRouter()
registrar_.Add(this,
chrome::NOTIFICATION_ACCESSIBILITY_VOLUME_CHANGED,
content::NotificationService::AllSources());
+ registrar_.Add(this,
+ chrome::NOTIFICATION_ACCESSIBILITY_SCREEN_UNLOCKED,
+ content::NotificationService::AllSources());
+ registrar_.Add(this,
+ chrome::NOTIFICATION_ACCESSIBILITY_WOKE_UP,
+ content::NotificationService::AllSources());
}
ExtensionAccessibilityEventRouter::~ExtensionAccessibilityEventRouter() {
@@ -107,6 +113,14 @@ void ExtensionAccessibilityEventRouter::Observe(
OnVolumeChanged(
content::Details<const AccessibilityVolumeInfo>(details).ptr());
break;
+ case chrome::NOTIFICATION_ACCESSIBILITY_SCREEN_UNLOCKED:
+ OnScreenUnlocked(
+ content::Details<const ScreenUnlockedEventInfo>(details).ptr());
+ break;
+ case chrome::NOTIFICATION_ACCESSIBILITY_WOKE_UP:
+ OnWokeUp(
+ content::Details<const WokeUpEventInfo>(details).ptr());
+ break;
default:
NOTREACHED();
}
@@ -170,6 +184,17 @@ void ExtensionAccessibilityEventRouter::OnVolumeChanged(
DispatchEvent(info->profile(), keys::kOnVolumeChanged, json_args);
}
+void ExtensionAccessibilityEventRouter::OnScreenUnlocked(
+ const ScreenUnlockedEventInfo* info) {
+ std::string json_args = ControlInfoToJsonString(info);
+ DispatchEvent(info->profile(), keys::kOnScreenUnlocked, json_args);
+}
+
+void ExtensionAccessibilityEventRouter::OnWokeUp(const WokeUpEventInfo* info) {
+ std::string json_args = ControlInfoToJsonString(info);
+ DispatchEvent(info->profile(), keys::kOnWokeUp, json_args);
+}
+
void ExtensionAccessibilityEventRouter::DispatchEvent(
Profile* profile,
const char* event_name,
diff --git a/chrome/browser/extensions/extension_accessibility_api.h b/chrome/browser/extensions/extension_accessibility_api.h
index 2ead75b..3962703 100644
--- a/chrome/browser/extensions/extension_accessibility_api.h
+++ b/chrome/browser/extensions/extension_accessibility_api.h
@@ -55,6 +55,8 @@ class ExtensionAccessibilityEventRouter : public content::NotificationObserver {
void OnMenuOpened(const AccessibilityMenuInfo* details);
void OnMenuClosed(const AccessibilityMenuInfo* details);
void OnVolumeChanged(const AccessibilityVolumeInfo* details);
+ void OnScreenUnlocked(const ScreenUnlockedEventInfo* details);
+ void OnWokeUp(const WokeUpEventInfo* details);
void DispatchEvent(Profile* profile,
const char* event_name,
diff --git a/chrome/browser/extensions/extension_accessibility_api_constants.cc b/chrome/browser/extensions/extension_accessibility_api_constants.cc
index c51d32d..dac37f3 100644
--- a/chrome/browser/extensions/extension_accessibility_api_constants.cc
+++ b/chrome/browser/extensions/extension_accessibility_api_constants.cc
@@ -30,6 +30,8 @@ const char kOnTextChanged[] = "experimental.accessibility.onTextChanged";
const char kOnMenuOpened[] = "experimental.accessibility.onMenuOpened";
const char kOnMenuClosed[] = "experimental.accessibility.onMenuClosed";
const char kOnVolumeChanged[] = "experimental.accessibility.onVolumeChanged";
+const char kOnScreenUnlocked[] = "experimental.accessibility.onScreenUnlocked";
+const char kOnWokeUp[] = "experimental.accessibility.onWokeUp";
// Types of controls that can receive accessibility events.
const char kTypeButton[] = "button";
diff --git a/chrome/browser/extensions/extension_accessibility_api_constants.h b/chrome/browser/extensions/extension_accessibility_api_constants.h
index 098a286f..a8f8ba7 100644
--- a/chrome/browser/extensions/extension_accessibility_api_constants.h
+++ b/chrome/browser/extensions/extension_accessibility_api_constants.h
@@ -34,6 +34,8 @@ extern const char kOnTextChanged[];
extern const char kOnMenuOpened[];
extern const char kOnMenuClosed[];
extern const char kOnVolumeChanged[];
+extern const char kOnScreenUnlocked[];
+extern const char kOnWokeUp[];
// Types of controls that can receive accessibility events
extern const char kTypeButton[];