diff options
| author | Hokein.Wu@gmail.com <Hokein.Wu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 11:44:37 +0000 |
|---|---|---|
| committer | Hokein.Wu@gmail.com <Hokein.Wu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 11:44:37 +0000 |
| commit | 66ae60f28f13469bd2b6bb665be3a9d975dec4cf (patch) | |
| tree | 83731fb76ee467903819c0c3ca75163bc7793d37 | |
| parent | a512b2fa731804f0458d18b23e3c09646da8dfa8 (diff) | |
| download | chromium_src-66ae60f28f13469bd2b6bb665be3a9d975dec4cf.zip chromium_src-66ae60f28f13469bd2b6bb665be3a9d975dec4cf.tar.gz chromium_src-66ae60f28f13469bd2b6bb665be3a9d975dec4cf.tar.bz2 | |
[SystemInfo API] Restrict display.onDisplayChanged event only on ChromeOS.
BUG=342731
TEST=manual
Review URL: https://codereview.chromium.org/148493012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250699 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/api/system_info/system_info_api.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/api/system_info/system_info_api.cc b/chrome/browser/extensions/api/system_info/system_info_api.cc index 26bbf41..542cc08 100644 --- a/chrome/browser/extensions/api/system_info/system_info_api.cc +++ b/chrome/browser/extensions/api/system_info/system_info_api.cc @@ -22,7 +22,7 @@ #include "chrome/common/extensions/api/system_storage.h" #include "ui/gfx/display_observer.h" -#if defined(USE_ASH) +#if defined(OS_CHROMEOS) #include "ash/shell.h" #include "ui/gfx/screen.h" #endif @@ -37,7 +37,7 @@ namespace system_storage = api::system_storage; namespace { -#if defined(USE_ASH) +#if defined(OS_CHROMEOS) bool IsDisplayChangedEvent(const std::string& event_name) { return event_name == system_display::OnDisplayChanged::kEventName; } @@ -115,8 +115,8 @@ void SystemInfoEventRouter::AddEventListener(const std::string& event_name) { if (watching_event_set_.count(event_name) > 1) return; - // For systemInfo.display event. -#if defined(USE_ASH) + // For system.display event. +#if defined(OS_CHROMEOS) if (IsDisplayChangedEvent(event_name)) ash::Shell::GetScreen()->AddObserver(this); #endif @@ -141,7 +141,7 @@ void SystemInfoEventRouter::RemoveEventListener(const std::string& event_name) { return; } -#if defined(USE_ASH) +#if defined(OS_CHROMEOS) if (IsDisplayChangedEvent(event_name)) ash::Shell::GetScreen()->RemoveObserver(this); #endif |