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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chrome_content_browser_client.cc

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
« chrome/browser/chrome_browser_main.cc ('K') | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/jankometer_android.cc » ('j') | chrome/browser/jankometer_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index add0506263c805954ad5693abf2c3e8889d8bb51..9fbc1893aec818eaa027b46093c67fd9c4ca0f48 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -114,6 +114,8 @@
#include "chrome/browser/chromeos/login/user_manager.h"
#elif defined(OS_LINUX)
#include "chrome/browser/chrome_browser_main_linux.h"
+#elif defined(OS_ANDROID)
+#include "chrome/browser/chrome_browser_main_android.h"
#elif defined(OS_POSIX)
#include "chrome/browser/chrome_browser_main_posix.h"
#endif
@@ -366,10 +368,7 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
#elif defined(OS_LINUX)
main_parts = new ChromeBrowserMainPartsLinux(parameters);
#elif defined(OS_ANDROID)
- // Do nothing for Android.
- // TODO(klobag): Android initialization should use the
- // *BrowserMainParts class-hierarchy for setting up custom initialization.
- main_parts = NULL;
+ main_parts = new ChromeBrowserMainPartsAndroid(parameters);
#elif defined(OS_POSIX)
main_parts = new ChromeBrowserMainPartsPosix(parameters);
#else
« chrome/browser/chrome_browser_main.cc ('K') | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/jankometer_android.cc » ('j') | chrome/browser/jankometer_android.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698