chrome/chrome_browser.gypi - Issue 6310013: Fix the build file for chromeos==1

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 6310013: Fix the build file for chromeos==1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 11 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 6c20c76579ddc71d96006d88e6c0d673d097a2c4..56f1eeddeac449770748c1a3cb1d4296115764ca 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -3595,8 +3595,6 @@

['exclude', '^browser/dom_ui/keyboard_ui.*'],

['exclude', '^browser/renderer_host/render_widget_host_view_views.*'],

['exclude', '^browser/ui/touch/*'],

- ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'],

- ['exclude', '^browser/ui/views/tab_contents/tab_contents_container_views.h'],

['exclude', '^browser/ui/views/tab_contents/tab_contents_view_views.*'],

}],

@@ -4127,8 +4125,6 @@

['include', '^browser/ui/views/tab_contents/tab_contents_container.h'],

['include', '^browser/ui/views/tab_contents/tab_contents_container_native.cc'],

['include', '^browser/ui/views/tab_contents/tab_contents_container_native.h'],

- ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'],

- ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.h'],

['include', '^browser/ui/views/tab_contents/tab_contents_view_gtk.cc'],

['include', '^browser/ui/views/tab_contents/tab_contents_view_gtk.h'],

['include', '^browser/ui/views/tab_icon_view.cc'],

@@ -4314,6 +4310,8 @@

# ['exclude', '^browser/ui/gtk/constrained_window_gtk.h'],

['exclude', '^browser/ui/views/tab_contents/tab_contents_container_native.cc'],

['exclude', '^browser/ui/views/tab_contents/tab_contents_container_native.h'],

+ ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'],

+ ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.h'],

}],

['OS=="linux" and chromeos==1',{

« no previous file with comments | « no previous file | no next file » | no next file with comments »