Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Side by Side 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/android/chrome_sync_shell_main_delegate.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/chrome_sync_shell_main_delegate.h" 5 #include "chrome/browser/android/chrome_sync_shell_main_delegate.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "sync/test/fake_server/android/fake_server_helper_android.h" 8 #include "sync/test/fake_server/android/fake_server_helper_android.h"
9 9
10 ChromeSyncShellMainDelegate::ChromeSyncShellMainDelegate() { 10 ChromeSyncShellMainDelegate::ChromeSyncShellMainDelegate() {
11 } 11 }
12 12
13 ChromeSyncShellMainDelegate::~ChromeSyncShellMainDelegate() { 13 ChromeSyncShellMainDelegate::~ChromeSyncShellMainDelegate() {
14 } 14 }
15 15
16 int ChromeSyncShellMainDelegate::RunProcess( 16 int ChromeSyncShellMainDelegate::RunProcess(
17 const std::string& process_type, 17 const std::string& process_type,
18 const content::MainFunctionParams& main_function_params) { 18 const content::MainFunctionParams& main_function_params) {
19 if (process_type.empty()) { 19 if (process_type.empty()) {
20 FakeServerHelperAndroid::Register(base::android::AttachCurrentThread()); 20 FakeServerHelperAndroid::Register(base::android::AttachCurrentThread());
21 } 21 }
22 return ChromeMainDelegateStagingAndroid::RunProcess( 22 return ChromeMainDelegateAndroid::RunProcess(
23 process_type, main_function_params); 23 process_type, main_function_params);
24 } 24 }
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_sync_shell_main_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698