chrome/browser/chrome_content_browser_client.cc - Issue 10885023: Use ChromeBrowserMainPartsAndroid.

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/chrome_content_browser_client.cc

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:

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

« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/jankometer_android.cc » ('j') | no next file with comments »