Index: extensions/browser/api/system_info/system_info_api.cc |
diff --git a/chrome/browser/extensions/api/system_info/system_info_api.cc b/extensions/browser/api/system_info/system_info_api.cc |
similarity index 92% |
rename from chrome/browser/extensions/api/system_info/system_info_api.cc |
rename to extensions/browser/api/system_info/system_info_api.cc |
index 99f49f5217ac4f191e716c974cd4e98dbce37c24..b56f5619b0b5f22565cd8bfaeaa932e9ac153071 100644 |
--- a/chrome/browser/extensions/api/system_info/system_info_api.cc |
+++ b/extensions/browser/api/system_info/system_info_api.cc |
@@ -2,7 +2,7 @@ |
// 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 "extensions/browser/api/system_info/system_info_api.h" |
#include <set> |
@@ -12,15 +12,14 @@ |
#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/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 "extensions/browser/api/system_storage/storage_info_provider.h" |
+#include "extensions/browser/extensions_browser_client.h" |
+#include "extensions/common/api/system_display.h" |
+#include "extensions/common/api/system_storage.h" |
#include "ui/gfx/display_observer.h" |
#if defined(OS_CHROMEOS) |
@@ -30,12 +29,12 @@ |
namespace extensions { |
-using api::system_storage::StorageUnitInfo; |
+using core_api::system_storage::StorageUnitInfo; |
using content::BrowserThread; |
using storage_monitor::StorageMonitor; |
-namespace system_display = api::system_display; |
-namespace system_storage = api::system_storage; |
+namespace system_display = core_api::system_display; |
+namespace system_storage = core_api::system_storage; |
namespace { |
@@ -203,8 +202,8 @@ void SystemInfoEventRouter::OnDisplayChanged() { |
void SystemInfoEventRouter::DispatchEvent(const std::string& event_name, |
scoped_ptr<base::ListValue> args) { |
- g_browser_process->extension_event_router_forwarder()-> |
- BroadcastEventToRenderers(event_name, args.Pass(), GURL()); |
+ ExtensionsBrowserClient::Get()->BroadcastEventToRenderers(event_name, |
+ args.Pass()); |
} |
void AddEventListener(const std::string& event_name) { |