chrome/browser/android/chrome_sync_shell_main_delegate.cc - Issue 1320253002: Merge ChromeMainDelegateStagingAndroid into ChromeMainDelegateAndroid.

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/android/chrome_sync_shell_main_delegate.cc

Issue 1320253002: Merge ChromeMainDelegateStagingAndroid into ChromeMainDelegateAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: used more specific DEPS rule Created 5 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/android/chrome_sync_shell_main_delegate.cc

diff --git a/chrome/browser/android/chrome_sync_shell_main_delegate.cc b/chrome/browser/android/chrome_sync_shell_main_delegate.cc

index b5bc9ed95c4405a289ad276e20bda8d7a7288380..2ea04f7f1f4afbf46435fadf8c67df18eb874208 100644

--- a/chrome/browser/android/chrome_sync_shell_main_delegate.cc

+++ b/chrome/browser/android/chrome_sync_shell_main_delegate.cc

@@ -19,6 +19,6 @@ int ChromeSyncShellMainDelegate::RunProcess(

if (process_type.empty()) {

FakeServerHelperAndroid::Register(base::android::AttachCurrentThread());

}

- return ChromeMainDelegateStagingAndroid::RunProcess(

+ return ChromeMainDelegateAndroid::RunProcess(

process_type, main_function_params);

}

« no previous file with comments | « chrome/browser/android/chrome_sync_shell_main_delegate.h ('k') | no next file » | no next file with comments »