chrome/browser/extensions/extension_system.cc - Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it.

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/extension_system.cc

Issue 10196004: Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed style nit Created 8 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/extension_service.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc » ('j') | chrome/browser/ui/webui/chrome_url_data_manager_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_system.cc

diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc

index 2026c6ca53bf07d3393d8c72e7dafaff886be057..fabe9a1e85b34b78b6617c350b5465261c08cb62 100644

--- a/chrome/browser/extensions/extension_system.cc

+++ b/chrome/browser/extensions/extension_system.cc

@@ -31,7 +31,7 @@

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"

+#include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"

#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/extension.h"

@@ -152,8 +152,8 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {

}

// Make the chrome://extension-icon/ resource available.

- profile_->GetChromeURLDataManager()->AddDataSource(

- new ExtensionIconSource(profile_));

+ ChromeURLDataManagerFactory::GetForProfile(profile_)->

+ AddDataSource(new ExtensionIconSource(profile_));

// Initialize extension event routers. Note that on Chrome OS, this will

// not succeed if the user has not logged in yet, in which case the