Add GetActiveScreen to DisplayInfoProvider

chrome/browser/extensions/api/system_info/system_info_api.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/system_info/system_info_api.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/api/system_display/display_info_provider.h"
 #include "chrome/browser/extensions/api/system_storage/storage_info_provider.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #include "chrome/common/extensions/api/system_display.h"
 #include "chrome/common/extensions/api/system_storage.h"
 #include "components/storage_monitor/removable_storage_observer.h"
 #include "components/storage_monitor/storage_info.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/display_observer.h"
-
-#if defined(OS_CHROMEOS)
-#include "ash/shell.h"
 #include "ui/gfx/screen.h"
-#endif
 
 namespace extensions {
 
 using api::system_storage::StorageUnitInfo;
 using content::BrowserThread;
 using storage_monitor::StorageMonitor;
 
 namespace system_display = api::system_display;
 namespace system_storage = api::system_storage;
 
 namespace {
 
-#if defined(OS_CHROMEOS)
 bool IsDisplayChangedEvent(const std::string& event_name) {
   return event_name == system_display::OnDisplayChanged::kEventName;
 }
-#endif
 
 bool IsSystemStorageEvent(const std::string& event_name) {
   return (event_name == system_storage::OnAttached::kEventName ||
           event_name == system_storage::OnDetached::kEventName);
 }
 
 // Event router for systemInfo API. It is a singleton instance shared by
 // multiple profiles.
 class SystemInfoEventRouter : public gfx::DisplayObserver,
                               public storage_monitor::RemovableStorageObserver {
@@ skipping 56 matching lines @@
   }
 }
 
 void SystemInfoEventRouter::AddEventListener(const std::string& event_name) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   watching_event_set_.insert(event_name);
   if (watching_event_set_.count(event_name) > 1)
     return;
 
-  // For system.display event.
-#if defined(OS_CHROMEOS)
-  if (IsDisplayChangedEvent(event_name))
-    ash::Shell::GetScreen()->AddObserver(this);
-#endif
+  if (IsDisplayChangedEvent(event_name)) {
+    gfx::Screen* screen = DisplayInfoProvider::Get()->GetActiveScreen();
+    if (screen)
+      screen->AddObserver(this);
+  }
 
   if (IsSystemStorageEvent(event_name)) {
     if (!has_storage_monitor_observer_) {
       has_storage_monitor_observer_ = true;
       DCHECK(StorageMonitor::GetInstance()->IsInitialized());
       StorageMonitor::GetInstance()->AddObserver(this);
     }
   }
 }
 
 void SystemInfoEventRouter::RemoveEventListener(const std::string& event_name) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   std::multiset<std::string>::iterator it =
       watching_event_set_.find(event_name);
   if (it != watching_event_set_.end()) {
     watching_event_set_.erase(it);
     if (watching_event_set_.count(event_name) > 0)
       return;
   }
 
-#if defined(OS_CHROMEOS)
-  if (IsDisplayChangedEvent(event_name))
-    ash::Shell::GetScreen()->RemoveObserver(this);
-#endif
+  if (IsDisplayChangedEvent(event_name)) {
+    gfx::Screen* screen = DisplayInfoProvider::Get()->GetActiveScreen();
+    if (screen)
+      screen->RemoveObserver(this);
+  }
 
   if (IsSystemStorageEvent(event_name)) {
     const std::string& other_event_name =
         (event_name == system_storage::OnDetached::kEventName) ?
             system_storage::OnAttached::kEventName :
             system_storage::OnDetached::kEventName;
     if (watching_event_set_.count(other_event_name) == 0) {
       StorageMonitor::GetInstance()->RemoveObserver(this);
       has_storage_monitor_observer_ = false;
     }
@@ skipping 90 matching lines @@
 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) {
   if (IsSystemStorageEvent(details.event_name)) {
     StorageMonitor::GetInstance()->EnsureInitialized(
         base::Bind(&RemoveEventListener, details.event_name));
   } else {
     RemoveEventListener(details.event_name);
   }
 }
 
 }  // namespace extensions