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

Unified Diff: ui/views/views.gyp

Issue 23922007: Merge the LinuxUI interface from its own .so into libviews.so. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 34b8093ed09c66a1e5a67025911532b75aa77327..db247e6d1785f623ea06153a3de0b6e97f828822 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -313,6 +313,10 @@
'layout/layout_constants.h',
'layout/layout_manager.cc',
'layout/layout_manager.h',
+ 'linux_ui/linux_ui.h',
+ 'linux_ui/linux_ui.cc',
+ 'linux_ui/status_icon_linux.h',
+ 'linux_ui/status_icon_linux.cc',
'metrics.cc',
'metrics.h',
'metrics_aura.cc',
@@ -548,10 +552,13 @@
['include', 'accessibility/native_view_accessibility_win.h'],
],
}],
- ['use_aura==1 and OS=="linux" and chromeos==0', {
+ ['OS=="linux" and chromeos==0', {
'dependencies': [
'../ui.gyp:shell_dialogs',
- '../linux_ui/linux_ui.gyp:linux_ui',
+ ],
+ }, { # OS=="linux" and chromeos==0
+ 'sources/': [
+ ['exclude', 'linux_ui'],
],
}],
['OS=="win"', {
« no previous file with comments | « ui/views/linux_ui/status_icon_linux.cc ('k') | ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698