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

Unified Diff: chrome/browser/chrome_browser_main.h

Issue 10885023: Use ChromeBrowserMainPartsAndroid. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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..af24464446538ebaf981b2db430ed630f33cc319 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -158,11 +158,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_;
Lei Zhang 2012/08/29 19:23:57 Are the StartupBrowserCreator class and ProcessSin
Yaron 2012/08/29 20:48:33 StartupBrowserCreator was already excluded via gyp
+
+ // 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_;

Powered by Google App Engine
This is Rietveld 408576698