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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/android/chrome_sync_shell_main_delegate.h

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_main_delegate_staging_android_initializer.cc ('k') | chrome/browser/android/chrome_sync_shell_main_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #ifndef CHROME_BROWSER_ANDROID_CHROME_SYNC_SHELL_MAIN_DELEGATE_H_	5 #ifndef CHROME_BROWSER_ANDROID_CHROME_SYNC_SHELL_MAIN_DELEGATE_H_

6 #define CHROME_BROWSER_ANDROID_CHROME_SYNC_SHELL_MAIN_DELEGATE_H_	6 #define CHROME_BROWSER_ANDROID_CHROME_SYNC_SHELL_MAIN_DELEGATE_H_

7	7

8 #include "chrome/browser/android/chrome_main_delegate_staging_android.h"	8 #include "chrome/app/android/chrome_main_delegate_android.h"

9	9

10 class ChromeSyncShellMainDelegate	10 class ChromeSyncShellMainDelegate : public ChromeMainDelegateAndroid {

11 : public ChromeMainDelegateStagingAndroid {

12 public:	11 public:

13 ChromeSyncShellMainDelegate();	12 ChromeSyncShellMainDelegate();

14 ~ChromeSyncShellMainDelegate() override;	13 ~ChromeSyncShellMainDelegate() override;

15	14

16 protected:	15 protected:

17 int RunProcess(	16 int RunProcess(

18 const std::string& process_type,	17 const std::string& process_type,

19 const content::MainFunctionParams& main_function_params) override;	18 const content::MainFunctionParams& main_function_params) override;

20	19

21 private:	20 private:

22 DISALLOW_COPY_AND_ASSIGN(ChromeSyncShellMainDelegate);	21 DISALLOW_COPY_AND_ASSIGN(ChromeSyncShellMainDelegate);

23 };	22 };

24	23

25 #endif // CHROME_BROWSER_ANDROID_CHROME_SYNC_SHELL_MAIN_DELEGATE_H_	24 #endif // CHROME_BROWSER_ANDROID_CHROME_SYNC_SHELL_MAIN_DELEGATE_H_

OLD	NEW