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

Unified Diff: chrome/browser/chrome_browser_main.h

Issue 10885023: Use ChromeBrowserMainPartsAndroid. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: thestig's comments Created 8 years, 4 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/browser/browser_process_impl.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.h
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index c820c168ee1f50d949285d3a0afc91dae757acb2..b2d1b17a2ca130a5e24e2b2399bd5b745aed3127 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -81,8 +81,10 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
virtual void PreBrowserStart();
virtual void PostBrowserStart();
+#if !defined(OS_ANDROID)
// Runs the PageCycler; called if the switch kVisitURLs is present.
virtual void RunPageCycler();
+#endif
// Override this in subclasses to initialize platform specific field trials.
virtual void SetupPlatformFieldTrials();
@@ -158,11 +160,17 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
// Members initialized after / released before main_message_loop_ ------------
- scoped_ptr<StartupBrowserCreator> browser_creator_;
scoped_ptr<BrowserProcessImpl> browser_process_;
scoped_refptr<chrome_browser_metrics::TrackingSynchronizer>
tracking_synchronizer_;
+#if !defined(OS_ANDROID)
+ // Browser creation happens on the Java side in Android.
+ scoped_ptr<StartupBrowserCreator> browser_creator_;
+
+ // Android doesn't support multiple browser processes, so it doesn't implement
+ // ProcessSingleton.
scoped_ptr<ProcessSingleton> process_singleton_;
+#endif
scoped_ptr<first_run::MasterPrefs> master_prefs_;
bool record_search_engine_;
TranslateManager* translate_manager_;
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698