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

Unified Diff: chrome/chrome.gyp

Issue 149367: Replace instances of LINUX2 with OS_CHROMEOS and linux2 with chromeos. (Closed)
Patch Set: Created 11 years, 5 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
« no previous file with comments | « chrome/browser/views/tabs/dragged_tab_view.cc ('k') | views/widget/widget_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 6bb20a509b5b4449b300bbaa9846e474f4be1f99..37fcaca16fa1ae836bd6db4966781ba5a88ab389 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -229,8 +229,8 @@
'-D', '<(chrome_build)'
],
'conditions': [
- ['linux2==1', {
- 'action': ['-D', 'linux2'],
+ ['chromeos==1', {
+ 'action': ['-D', 'chromeos'],
}],
],
'message': 'Generating resources from <(input_path)',
@@ -2077,7 +2077,7 @@
['exclude', '^browser/tab_contents/render_view_context_menu_gtk.h'],
],
}],
- ['linux2==1',{
+ ['chromeos==1',{
'sources/': [
['include', 'browser/views/new_browser_window_widget.cc'],
['include', 'browser/views/new_browser_window_widget.h'],
@@ -2548,7 +2548,7 @@
},
],
}],
- ['OS=="linux" and (toolkit_views==1 or linux2==1)', {
+ ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
'dependencies': [
'../views/views.gyp:views',
],
@@ -3658,7 +3658,7 @@
'../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
],
}],
- ['OS=="linux" and (toolkit_views==1 or linux2==1)', {
+ ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
'dependencies': [
'../views/views.gyp:views',
],
« no previous file with comments | « chrome/browser/views/tabs/dragged_tab_view.cc ('k') | views/widget/widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698