chrome/browser/dom_ui/options/stop_syncing_handler.cc - Issue 6260002: Fix chromium-os:10777 and other sync related crashes.

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/dom_ui/options/stop_syncing_handler.cc

Issue 6260002: Fix chromium-os:10777 and other sync related crashes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 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:

Index: chrome/browser/dom_ui/options/stop_syncing_handler.cc

diff --git a/chrome/browser/dom_ui/options/stop_syncing_handler.cc b/chrome/browser/dom_ui/options/stop_syncing_handler.cc

index 833c88e6333d2ac0af663d81d35ab9340c9bbe09..d51a4909932d0f086df5b72d13f5f59a997eafa0 100644

--- a/chrome/browser/dom_ui/options/stop_syncing_handler.cc

+++ b/chrome/browser/dom_ui/options/stop_syncing_handler.cc

@@ -39,7 +39,8 @@ void StopSyncingHandler::RegisterMessages() {

}

void StopSyncingHandler::StopSyncing(const ListValue* args){

- ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService();

+ ProfileSyncService* service =

+ dom_ui_->GetOriginalProfile()->GetProfileSyncService();

if (service != NULL && ProfileSyncService::IsSyncEnabled()) {

service->DisableForUser();

ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);