[Cleanup] Screen cleanup

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_storage/storage_info_provider.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #include "chrome/browser/storage_monitor/removable_storage_observer.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/common/extensions/api/system_display.h"
 #include "chrome/common/extensions/api/system_storage.h"
 #include "ui/gfx/display_observer.h"
 
 #if defined(USE_ASH)
-#include "ash/screen_ash.h"
 #include "ash/shell.h"
+#include "ui/gfx/screen.h"

[Jun Mukai, 2014/01/15 19:20:15]

You can put ui/gfx/screen.h outside of USE_ASH right?

[oshima, 2014/01/15 19:42:51]

I can, but shouldn't because it is used only in USE_ASH.

 #endif
 
 namespace extensions {
 
 using api::system_storage::StorageUnitInfo;
 using content::BrowserThread;
 
 namespace system_display = api::system_display;
 namespace system_storage = api::system_storage;
 
@@ skipping 163 matching lines @@
 
 void SystemInfoAPI::OnListenerAdded(const EventListenerInfo& details) {
   SystemInfoEventRouter::GetInstance()->AddEventListener(details.event_name);
 }
 
 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) {
   SystemInfoEventRouter::GetInstance()->RemoveEventListener(details.event_name);
 }
 
 }  // namespace extensions