chrome/browser/chrome_browser_main.h - Issue 1391893003: NOT FOR REVIEW: Aura on Android

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_browser_main.h

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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_browser_main.h

diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h

index b0fd85ef1ee9e735dbfad91faf5fb0a9953ded56..f77df6b61647939f44c116be305f583ae658cc9a 100644

--- a/chrome/browser/chrome_browser_main.h

+++ b/chrome/browser/chrome_browser_main.h

@@ -147,7 +147,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {

scoped_ptr<BrowserProcessImpl> browser_process_;

scoped_refptr<metrics::TrackingSynchronizer> tracking_synchronizer_;

-#if !defined(OS_ANDROID)

+#if !defined(OS_ANDROID) || defined(USE_AURA)

// Browser creation happens on the Java side in Android.

scoped_ptr<StartupBrowserCreator> browser_creator_;

@@ -157,7 +157,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {

// Android's first run is done in Java instead of native.

scoped_ptr<first_run::MasterPrefs> master_prefs_;

-#endif

+#endif // !defined(OS_ANDROID) || defined(USE_AURA)

Profile* profile_;

bool run_message_loop_;

ProcessSingleton::NotifyResult notify_result_;