chrome/browser/ui/webui/conflicts_ui.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/ui/webui/conflicts_ui.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

« chrome/browser/ui/webui/chrome_url_data_manager_factory.cc ('K') | « chrome/browser/ui/webui/chromeos/system_info_ui.cc ('k') | chrome/browser/ui/webui/crashes_ui.cc » ('j') | chrome/browser/ui/webui/media/media_internals_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/conflicts_ui.cc

diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc

index 1110ee59b9d2d7f0f60a554a0d61fff5f0a578fd..0a1441beeedd0ff7797992128e04f088f8fff626 100644

--- a/chrome/browser/ui/webui/conflicts_ui.cc

+++ b/chrome/browser/ui/webui/conflicts_ui.cc

@@ -15,7 +15,7 @@

#include "base/values.h"

#include "chrome/browser/enumerate_modules_model_win.h"

#include "chrome/browser/profiles/profile.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/chrome_web_ui_data_source.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/url_constants.h"

@@ -166,8 +166,8 @@ ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) {

// Set up the about:conflicts source.

Profile* profile = Profile::FromWebUI(web_ui);

- profile->GetChromeURLDataManager()->AddDataSource(

- CreateConflictsUIHTMLSource());

+ ChromeURLDataManagerFactory::GetForProfile(profile)->

+ AddDataSource(CreateConflictsUIHTMLSource());

}

// static