chrome/browser/extensions/api/preference/preference_api.cc - Issue 238633009: cleanup: Use EventRouter instead of ExtensionSystem::Get->event_router()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/preference/preference_api.cc

Issue 238633009: cleanup: Use EventRouter instead of ExtensionSystem::Get->event_router() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix compile error for chromeos build. Created 6 years, 8 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

« no previous file with comments | « chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc ('k') | chrome/browser/extensions/api/preference/preference_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/preference/preference_api.cc

diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc

index a9645956cd2df0db7ecdef16a773c6a8ae7692a3..26a088fb5ec006a06bfa9fa00df18c24b6d4a57a 100644

--- a/chrome/browser/extensions/api/preference/preference_api.cc

+++ b/chrome/browser/extensions/api/preference/preference_api.cc

@@ -27,7 +27,6 @@

#include "extensions/browser/extension_pref_value_map.h"

#include "extensions/browser/extension_pref_value_map_factory.h"

#include "extensions/browser/extension_prefs_factory.h"

-#include "extensions/browser/extension_system.h"

#include "extensions/browser/extension_system_provider.h"

#include "extensions/browser/extensions_browser_client.h"

#include "extensions/browser/pref_names.h"

@@ -413,8 +412,7 @@ PreferenceAPI::PreferenceAPI(content::BrowserContext* context)

bool rv = PrefMapping::GetInstance()->FindEventForBrowserPref(

kPrefMapping[i].browser_pref, &event_name, &permission);

DCHECK(rv);

- ExtensionSystem::Get(profile_)->event_router()->RegisterObserver(

- this, event_name);

+ EventRouter::Get(profile_)->RegisterObserver(this, event_name);

}

content_settings_store()->AddObserver(this);

}

@@ -423,7 +421,7 @@ PreferenceAPI::~PreferenceAPI() {

}

void PreferenceAPI::Shutdown() {

- ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);

+ EventRouter::Get(profile_)->UnregisterObserver(this);

if (!extension_prefs()->extensions_disabled())

ClearIncognitoSessionOnlyContentSettings();

content_settings_store()->RemoveObserver(this);

@@ -445,7 +443,7 @@ PreferenceAPI* PreferenceAPI::Get(content::BrowserContext* context) {

void PreferenceAPI::OnListenerAdded(const EventListenerInfo& details) {

preference_event_router_.reset(new PreferenceEventRouter(profile_));

- ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);

+ EventRouter::Get(profile_)->UnregisterObserver(this);

}

void PreferenceAPI::OnContentSettingChanged(const std::string& extension_id,