chrome/browser/ui/webui/options2/browser_options_handler2.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/options2/browser_options_handler2.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: Added static ChromeURLDataManager::AddSource() 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/profiles/off_the_record_profile_impl.cc ('K') | « chrome/browser/ui/webui/omnibox/omnibox_ui.cc ('k') | chrome/browser/ui/webui/options2/options_ui2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc

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

index 83de954fe9add760909b0cabd7c9db69b882f69e..3e8914239eef4e2afc3bbbfaf539a850eeaa7e9f 100644

--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc

+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc

@@ -48,6 +48,7 @@

#include "chrome/browser/themes/theme_service.h"

#include "chrome/browser/themes/theme_service_factory.h"

#include "chrome/browser/ui/options/options_util.h"

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

#include "chrome/browser/ui/webui/favicon_source.h"

#include "chrome/browser/ui/webui/web_ui_util.h"

#include "chrome/common/chrome_constants.h"

@@ -547,7 +548,7 @@ void BrowserOptionsHandler::InitializeHandler() {

OnStateChanged();

// Create our favicon data source.

- profile->GetChromeURLDataManager()->AddDataSource(

+ ChromeURLDataManager::AddDataSource(profile,

new FaviconSource(profile, FaviconSource::FAVICON));

default_browser_policy_.Init(prefs::kDefaultBrowserSettingEnabled,