chrome/browser/sync/glue/ui_data_type_controller.cc - Issue 15987009: Update chrome/ to use WeakPtr<T>::get() instead of implicit "operator T*"

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/sync/glue/ui_data_type_controller.cc

Issue 15987009: Update chrome/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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/sync/glue/shared_change_processor.cc ('k') | chrome/browser/sync_file_system/drive/local_change_processor_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/ui_data_type_controller.cc

diff --git a/chrome/browser/sync/glue/ui_data_type_controller.cc b/chrome/browser/sync/glue/ui_data_type_controller.cc

index a3e5b6144d1da24c90353f655b2a9d03accea2e3..878e91d0a476844d806dc0ed4692714c35ef7293 100644

--- a/chrome/browser/sync/glue/ui_data_type_controller.cc

+++ b/chrome/browser/sync/glue/ui_data_type_controller.cc

@@ -130,7 +130,7 @@ void UIDataTypeController::Associate() {

this,

type(),

weak_ptr_factory.GetWeakPtr());

- if (!local_service_) {

+ if (!local_service_.get()) {

syncer::SyncError error(FROM_HERE, "Failed to connect to syncer.", type());

local_merge_result.set_error(error);

StartDone(UNRECOVERABLE_ERROR,

@@ -270,7 +270,7 @@ void UIDataTypeController::Stop() {

sync_service_->DeactivateDataType(type());

- if (local_service_) {

+ if (local_service_.get()) {

local_service_->StopSyncing(type());

}