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

Side by Side Diff: ui/ui.gyp

Issue 10919135: Move ash specific cursor code to CursorManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/x/x11_util.cc ('k') | webkit/glue/webcursor_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 'base/cocoa/fullscreen_window_manager.h', 130 'base/cocoa/fullscreen_window_manager.h',
131 'base/cocoa/fullscreen_window_manager.mm', 131 'base/cocoa/fullscreen_window_manager.mm',
132 'base/cocoa/nib_loading.h', 132 'base/cocoa/nib_loading.h',
133 'base/cocoa/nib_loading.mm', 133 'base/cocoa/nib_loading.mm',
134 'base/cocoa/underlay_opengl_hosting_window.h', 134 'base/cocoa/underlay_opengl_hosting_window.h',
135 'base/cocoa/underlay_opengl_hosting_window.mm', 135 'base/cocoa/underlay_opengl_hosting_window.mm',
136 'base/cocoa/window_size_constants.h', 136 'base/cocoa/window_size_constants.h',
137 'base/cocoa/window_size_constants.mm', 137 'base/cocoa/window_size_constants.mm',
138 'base/cursor/cursor.cc', 138 'base/cursor/cursor.cc',
139 'base/cursor/cursor.h', 139 'base/cursor/cursor.h',
140 'base/cursor/cursor_loader.h',
141 'base/cursor/cursor_loader_win.cc',
142 'base/cursor/cursor_loader_win.h',
143 'base/cursor/cursor_loader_x11.cc',
144 'base/cursor/cursor_loader_x11.h',
140 'base/cursor/cursor_win.cc', 145 'base/cursor/cursor_win.cc',
141 'base/cursor/cursor_x11.cc', 146 'base/cursor/cursor_x11.cc',
142 'base/dialogs/base_shell_dialog.cc', 147 'base/dialogs/base_shell_dialog.cc',
143 'base/dialogs/base_shell_dialog.h', 148 'base/dialogs/base_shell_dialog.h',
144 'base/dialogs/base_shell_dialog_win.cc', 149 'base/dialogs/base_shell_dialog_win.cc',
145 'base/dialogs/base_shell_dialog_win.h', 150 'base/dialogs/base_shell_dialog_win.h',
146 'base/dialogs/gtk/select_file_dialog_impl.cc', 151 'base/dialogs/gtk/select_file_dialog_impl.cc',
147 'base/dialogs/gtk/select_file_dialog_impl.h', 152 'base/dialogs/gtk/select_file_dialog_impl.h',
148 'base/dialogs/gtk/select_file_dialog_impl_gtk.cc', 153 'base/dialogs/gtk/select_file_dialog_impl_gtk.cc',
149 'base/dialogs/gtk/select_file_dialog_impl_kde.cc', 154 'base/dialogs/gtk/select_file_dialog_impl_kde.cc',
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 ['exclude', 'base/x/root_window_property_watcher_x.cc'], 540 ['exclude', 'base/x/root_window_property_watcher_x.cc'],
536 ['exclude', 'base/x/root_window_property_watcher_x.h'], 541 ['exclude', 'base/x/root_window_property_watcher_x.h'],
537 ['exclude', 'base/x/work_area_watcher_x.cc'], 542 ['exclude', 'base/x/work_area_watcher_x.cc'],
538 ['exclude', 'base/x/work_area_watcher_x.h'], 543 ['exclude', 'base/x/work_area_watcher_x.h'],
539 ['exclude', 'ui_controls_win.cc'], 544 ['exclude', 'ui_controls_win.cc'],
540 ], 545 ],
541 }, { # use_aura!=1 546 }, { # use_aura!=1
542 'sources!': [ 547 'sources!': [
543 'base/cursor/cursor.cc', 548 'base/cursor/cursor.cc',
544 'base/cursor/cursor.h', 549 'base/cursor/cursor.h',
550 'base/cursor/cursor_loader_x11.cc',
551 'base/cursor/cursor_loader_x11.h',
545 'base/cursor/cursor_win.cc', 552 'base/cursor/cursor_win.cc',
546 'base/cursor/cursor_x11.cc', 553 'base/cursor/cursor_x11.cc',
547 'base/native_theme/native_theme_aura.cc', 554 'base/native_theme/native_theme_aura.cc',
548 'base/native_theme/native_theme_aura.h', 555 'base/native_theme/native_theme_aura.h',
549 ] 556 ]
550 }], 557 }],
551 ['use_aura==1 and OS=="win"', { 558 ['use_aura==1 and OS=="win"', {
552 'sources/': [ 559 'sources/': [
553 ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'], 560 ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'],
554 ['exclude', 'base/dragdrop/os_exchange_data_provider_win.h'], 561 ['exclude', 'base/dragdrop/os_exchange_data_provider_win.h'],
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 }, 790 },
784 ], 791 ],
785 'conditions': [ 792 'conditions': [
786 ['inside_chromium_build == 1', { 793 ['inside_chromium_build == 1', {
787 'includes': [ 794 'includes': [
788 'ui_unittests.gypi', 795 'ui_unittests.gypi',
789 ]}, 796 ]},
790 ], 797 ],
791 ], 798 ],
792 } 799 }
OLDNEW
« no previous file with comments | « ui/base/x/x11_util.cc ('k') | webkit/glue/webcursor_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698