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

Unified Diff: ui/ui.gyp

Issue 7833016: aura: A few changes to have aura_demo compile and run on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 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 | « ui/gfx/screen_aura.cc ('k') | views/metrics_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index da8a578c12268c43f9803cfa24b15f38ff6f59aa..e3a30ee99afb6df0d9574d7913173378895e4ad2 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -294,9 +294,11 @@
'conditions': [
['use_aura==1', {
'sources/': [
+ ['exclude', 'gfx/gtk_'],
+ ['exclude', 'gfx/screen_gtk.cc'],
['exclude', 'gfx/screen_win.cc'],
['exclude', 'base/win/mouse_wheel_util.cc'],
- ['exclude', 'base/win/mouse_wheel_util.h'],
+ ['exclude', 'base/win/mouse_wheel_util.h'],
],
}],
['toolkit_uses_gtk == 1', {
@@ -315,6 +317,8 @@
'gfx/gtk_preserve_window.h',
'gfx/gtk_util.cc',
'gfx/gtk_util.h',
+ 'gfx/linux_util.cc',
+ 'gfx/linux_util.h',
'gfx/native_theme_linux.cc',
'gfx/native_theme_linux.h',
],
@@ -360,6 +364,8 @@
['include', 'gfx/path_gtk.cc'],
['include', 'gfx/platform_font_gtk.cc'],
['include', 'gfx/platform_font_gtk.h'],
+ ['include', 'gfx/linux_util.cc'],
+ ['include', 'gfx/linux_util.h'],
],
}],
['OS=="win"', {
« no previous file with comments | « ui/gfx/screen_aura.cc ('k') | views/metrics_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698