chrome/browser/ui/webui/options2/browser_options_handler2.cc - Issue 9169096: Remove a bunch of GetProfileSyncService callers to use the new factory.

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 9169096: Remove a bunch of GetProfileSyncService callers to use the new factory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rm todos Created 8 years, 11 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/ui/webui/options/stop_syncing_handler.cc ('k') | chrome/browser/ui/webui/options2/options_sync_setup_handler2.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 1720519d0615154da362c1fc2826478d25c779db..7f029940ede8b0fc0f2a89f3ff0c3c1e67d6a607 100644

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

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

@@ -35,6 +35,7 @@

#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

#include "chrome/browser/sync/profile_sync_service.h"

+#include "chrome/browser/sync/profile_sync_service_factory.h"

#include "chrome/browser/sync/sync_setup_flow.h"

#include "chrome/browser/sync/sync_ui_util.h"

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

@@ -95,8 +96,8 @@ BrowserOptionsHandler::BrowserOptionsHandler()

}

BrowserOptionsHandler::~BrowserOptionsHandler() {

- ProfileSyncService* sync_service =

- Profile::FromWebUI(web_ui())->GetProfileSyncService();

+ ProfileSyncService* sync_service(ProfileSyncServiceFactory::

+ GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));

if (sync_service)

sync_service->RemoveObserver(this);

@@ -280,8 +281,8 @@ void BrowserOptionsHandler::RegisterMessages() {

void BrowserOptionsHandler::OnStateChanged() {

string16 status_label;

string16 link_label;

- ProfileSyncService* service =

- Profile::FromWebUI(web_ui())->GetProfileSyncService();

+ ProfileSyncService* service(ProfileSyncServiceFactory::

+ GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));

DCHECK(service);

bool managed = service->IsManaged();

bool sync_setup_completed = service->HasSyncSetupCompleted();

@@ -371,7 +372,8 @@ void BrowserOptionsHandler::OnStateChanged() {

void BrowserOptionsHandler::Initialize() {

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

- ProfileSyncService* sync_service = profile->GetProfileSyncService();

+ ProfileSyncService* sync_service(ProfileSyncServiceFactory::

+ GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));

if (sync_service) {

sync_service->AddObserver(this);

OnStateChanged();