chrome/browser/bookmarks/bookmark_model_factory.cc - Issue 586913002: Add BookmarkUndoService to Android build

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/bookmarks/bookmark_model_factory.cc

Issue 586913002: Add BookmarkUndoService to Android build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: suspend undo service during sync changes Created 6 years, 3 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/bookmarks/bookmark_model_factory.cc

diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc

index 3ad36d51f2860da7f9cfdc074ba463dd04e6a0f3..d20e52f50fd3dc72bc3169d7ff365498c37fb6c7 100644

--- a/chrome/browser/bookmarks/bookmark_model_factory.cc

+++ b/chrome/browser/bookmarks/bookmark_model_factory.cc

@@ -67,9 +67,8 @@ KeyedService* BookmarkModelFactory::BuildServiceInstanceFor(

->GetBookmarkTaskRunner(),

content::BrowserThread::GetMessageLoopProxyForThread(

content::BrowserThread::UI));

-#if !defined(OS_ANDROID)

bool register_bookmark_undo_service_as_observer = true;

-#if !defined(OS_IOS)

+#if !defined(OS_IOS) && !defined(OS_ANDROID)

register_bookmark_undo_service_as_observer =

CommandLine::ForCurrentProcess()->HasSwitch(

switches::kEnableBookmarkUndo);

@@ -78,7 +77,6 @@ KeyedService* BookmarkModelFactory::BuildServiceInstanceFor(

bookmark_model->AddObserver(

BookmarkUndoServiceFactory::GetForProfile(profile));

}

-#endif // !defined(OS_ANDROID)

return bookmark_model;

}