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

Unified Diff: chrome/app/chrome_main_delegate.h

Issue 10918113: Add initial Chromium TestShell support for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up some of the code. Created 8 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/app/chrome_main_delegate.h
diff --git a/chrome/app/chrome_main_delegate.h b/chrome/app/chrome_main_delegate.h
index 3670dd5418bbbed4136a2ebcfbd5016bca44b73a..f68ddaa326e7185843e3e217568c45749a5597d9 100644
--- a/chrome/app/chrome_main_delegate.h
+++ b/chrome/app/chrome_main_delegate.h
@@ -16,14 +16,17 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
ChromeMainDelegate();
virtual ~ChromeMainDelegate();
- private:
// content::ContentMainDelegate implementation:
+ protected:
virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
- virtual void PreSandboxStartup() OVERRIDE;
virtual void SandboxInitialized(const std::string& process_type) OVERRIDE;
virtual int RunProcess(
const std::string& process_type,
const content::MainFunctionParams& main_function_params) OVERRIDE;
+
+ private:
+ virtual void PreSandboxStartup() OVERRIDE;
jam 2012/09/07 22:40:26 splitting up these overridden functions makes read
David Trainor- moved to gerrit 2012/09/10 18:09:13 Done.
+
virtual void ProcessExiting(const std::string& process_type) OVERRIDE;
#if defined(OS_MACOSX)
virtual bool ProcessRegistersWithSystemProcess(

Powered by Google App Engine
This is Rietveld 408576698