chrome/browser/android/chrome_main_delegate_staging_android.h - 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_main_delegate_staging_android.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/app/android/chrome_main_delegate_android_initializer.cc ('k') | chrome/browser/android/chrome_main_delegate_staging_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/chrome_main_delegate_staging_android.h

diff --git a/chrome/browser/android/chrome_main_delegate_staging_android.h b/chrome/browser/android/chrome_main_delegate_staging_android.h

index dbf5b58848a50817b9dbfc08b692e01e6d49c2ee..d176a88bdbad05580773fecccc3deab747905bda 100644

--- a/chrome/browser/android/chrome_main_delegate_staging_android.h

+++ b/chrome/browser/android/chrome_main_delegate_staging_android.h

@@ -15,22 +15,6 @@ class ChromeMainDelegateStagingAndroid : public ChromeMainDelegateAndroid {

ChromeMainDelegateStagingAndroid();

~ChromeMainDelegateStagingAndroid() override;

- protected:

- int RunProcess(

- const std::string& process_type,

- const content::MainFunctionParams& main_function_params) override;

-#if defined(SAFE_BROWSING_DB_REMOTE)

- virtual SafeBrowsingApiHandler* CreateSafeBrowsingApiHandler();

-#endif

- private:

- bool BasicStartupComplete(int* exit_code) override;

- void ProcessExiting(const std::string& process_type) override;

-#if defined(SAFE_BROWSING_DB_REMOTE)

- scoped_ptr<SafeBrowsingApiHandler> safe_browsing_api_handler_;

-#endif

DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateStagingAndroid);

};