Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(526)

Unified Diff: chrome/browser/chromeos/extensions/file_browser_event_router.cc

Issue 11232066: Remove GetExtensionEventRouter from Profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/file_browser_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index 715ad8aa4c9afec8abba5c2232d05ffb1b47faa7..4fdb414813c4e5e0bea1a29180ea2bd1b977e26e 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/extensions/event_names.h"
#include "chrome/browser/extensions/event_router.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/google_apis/drive_service_interface.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -373,20 +374,23 @@ void FileBrowserEventRouter::MountCompleted(
void FileBrowserEventRouter::OnNetworkManagerChanged(
chromeos::NetworkLibrary* network_library) {
- if (!profile_ || !profile_->GetExtensionEventRouter()) {
+ if (!profile_ ||
+ !extensions::ExtensionSystem::Get(profile_)->event_router()) {
NOTREACHED();
return;
}
- profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
- extensions::event_names::kOnFileBrowserNetworkConnectionChanged,
- scoped_ptr<ListValue>(new ListValue()), NULL, GURL());
+ extensions::ExtensionSystem::Get(profile_)->event_router()->
+ DispatchEventToRenderers(
+ extensions::event_names::kOnFileBrowserNetworkConnectionChanged,
+ scoped_ptr<ListValue>(new ListValue()), NULL, GURL());
}
void FileBrowserEventRouter::Observe(
int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
- if (!profile_ || !profile_->GetExtensionEventRouter()) {
+ if (!profile_ ||
+ !extensions::ExtensionSystem::Get(profile_)->event_router()) {
NOTREACHED();
return;
}
@@ -411,9 +415,10 @@ void FileBrowserEventRouter::Observe(
*pref_name == prefs::kDisableDriveHostedFiles ||
*pref_name == prefs::kDisableDrive ||
*pref_name == prefs::kUse24HourClock) {
- profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
- extensions::event_names::kOnFileBrowserPreferencesChanged,
- scoped_ptr<ListValue>(new ListValue()), NULL, GURL());
+ extensions::ExtensionSystem::Get(profile_)->event_router()->
+ DispatchEventToRenderers(
+ extensions::event_names::kOnFileBrowserPreferencesChanged,
+ scoped_ptr<ListValue>(new ListValue()), NULL, GURL());
}
}
}
@@ -431,10 +436,11 @@ void FileBrowserEventRouter::OnProgressUpdate(
scoped_ptr<ListValue> args(new ListValue());
args->Append(event_list.release());
- profile_->GetExtensionEventRouter()->DispatchEventToExtension(
- std::string(kFileBrowserDomain),
- extensions::event_names::kOnFileTransfersUpdated, args.Pass(), NULL,
- GURL());
+ extensions::ExtensionSystem::Get(profile_)->event_router()->
+ DispatchEventToExtension(
+ std::string(kFileBrowserDomain),
+ extensions::event_names::kOnFileTransfersUpdated, args.Pass(), NULL,
+ GURL());
}
void FileBrowserEventRouter::OnDirectoryChanged(
@@ -450,10 +456,11 @@ void FileBrowserEventRouter::OnDocumentFeedFetched(
scoped_ptr<ListValue> args(new ListValue());
args->Append(base::Value::CreateIntegerValue(num_accumulated_entries));
- profile_->GetExtensionEventRouter()->DispatchEventToExtension(
- std::string(kFileBrowserDomain),
- extensions::event_names::kOnDocumentFeedFetched, args.Pass(), NULL,
- GURL());
+ extensions::ExtensionSystem::Get(profile_)->event_router()->
+ DispatchEventToExtension(
+ std::string(kFileBrowserDomain),
+ extensions::event_names::kOnDocumentFeedFetched, args.Pass(), NULL,
+ GURL());
}
void FileBrowserEventRouter::OnFileSystemMounted() {
@@ -527,9 +534,9 @@ void FileBrowserEventRouter::DispatchFolderChangeEvent(
watch_info->SetString("eventType",
got_error ? kPathWatchError : kPathChanged);
- profile_->GetExtensionEventRouter()->DispatchEventToExtension(
- iter->first, extensions::event_names::kOnFileChanged, args.Pass(), NULL,
- GURL());
+ extensions::ExtensionSystem::Get(profile_)->event_router()->
+ DispatchEventToExtension(iter->first,
+ extensions::event_names::kOnFileChanged, args.Pass(), NULL, GURL());
}
}
@@ -549,9 +556,10 @@ void FileBrowserEventRouter::DispatchDiskEvent(
DictionaryValue* disk_info = DiskToDictionaryValue(disk);
mount_info->Set("volumeInfo", disk_info);
- profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
- extensions::event_names::kOnFileBrowserDiskChanged, args.Pass(), NULL,
- GURL());
+ extensions::ExtensionSystem::Get(profile_)->event_router()->
+ DispatchEventToRenderers(
+ extensions::event_names::kOnFileBrowserDiskChanged, args.Pass(), NULL,
+ GURL());
}
void FileBrowserEventRouter::DispatchMountCompletedEvent(
@@ -599,9 +607,10 @@ void FileBrowserEventRouter::DispatchMountCompletedEvent(
}
}
- profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
- extensions::event_names::kOnFileBrowserMountCompleted, args.Pass(), NULL,
- GURL());
+ extensions::ExtensionSystem::Get(profile_)->event_router()->
+ DispatchEventToRenderers(
+ extensions::event_names::kOnFileBrowserMountCompleted, args.Pass(),
+ NULL, GURL());
// Do not attempt to open File Manager while the login is in progress or
// the screen is locked.

Powered by Google App Engine
This is Rietveld 408576698