chrome/chrome_browser.gypi - Issue 10819003: Upstreaming ChromeBrowserMainAndroid

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/chrome_browser.gypi

Issue 10819003: Upstreaming ChromeBrowserMainAndroid (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase 2 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/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index d74c016eda7b9c10a23f907c597fc501f369d48d..37fac9e62527d3980850500d876a30dd553aff58 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -411,6 +411,8 @@

'browser/chrome_browser_field_trials.h',

'browser/chrome_browser_main.cc',

'browser/chrome_browser_main.h',

+ 'browser/chrome_browser_main_android.cc',

+ 'browser/chrome_browser_main_android.h',

'browser/chrome_browser_main_extra_parts.h',

'browser/chrome_browser_main_linux.cc',

'browser/chrome_browser_main_linux.h',

@@ -4982,6 +4984,10 @@

'browser/upgrade_detector.h',

'browser/upgrade_detector_impl.cc',

'browser/upgrade_detector_impl.h',

+ # Not used by Android

+ 'browser/chrome_browser_main_posix.cc',

+ 'browser/chrome_browser_main_posix.h',

'sources/': [

['exclude', '^browser/captive_portal/'],

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