Sort GYP files under ui

For tools/sort_sources.py to be useful, existing GYP files should be sorted. BUG=456014 TEST=everything should build as before Review URL: https://codereview.chromium.org/918953005 Cr-Commit-Position: refs/heads/master@{#316729}
marcosholgado · Feb 18, 2015 · 129da84 · 129da84
1 parent 130aedc
commit 129da84
Show file tree

Hide file tree

Showing 22 changed files with 162 additions and 162 deletions.
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
@@ -38,10 +38,10 @@
         'app_list_folder_item.h',
         'app_list_item.cc',
         'app_list_item.h',
-        'app_list_item_observer.h',
         'app_list_item_list.cc',
         'app_list_item_list.h',
         'app_list_item_list_observer.h',
+        'app_list_item_observer.h',
         'app_list_menu.cc',
         'app_list_menu.h',
         'app_list_model.cc',
@@ -81,15 +81,6 @@
         'pagination_model.cc',
         'pagination_model.h',
         'pagination_model_observer.h',
-        'search_box_model.cc',
-        'search_box_model.h',
-        'search_box_model_observer.h',
-        'search_controller.cc',
-        'search_controller.h',
-        'search_provider.cc',
-        'search_provider.h',
-        'search_result.cc',
-        'search_result.h',
         'search/dictionary_data_store.cc',
         'search/dictionary_data_store.h',
         'search/history.cc',
@@ -109,13 +100,20 @@
         'search/tokenized_string_char_iterator.h',
         'search/tokenized_string_match.cc',
         'search/tokenized_string_match.h',
+        'search_box_model.cc',
+        'search_box_model.h',
+        'search_box_model_observer.h',
+        'search_controller.cc',
+        'search_controller.h',
+        'search_provider.cc',
+        'search_provider.h',
+        'search_result.cc',
+        'search_result.h',
         'speech_ui_model.cc',
         'speech_ui_model.h',
         'speech_ui_model_observer.h',
-        'views/all_apps_tile_item_view.h',
         'views/all_apps_tile_item_view.cc',
-        'views/apps_container_view.cc',
-        'views/apps_container_view.h',
+        'views/all_apps_tile_item_view.h',
         'views/app_list_background.cc',
         'views/app_list_background.h',
         'views/app_list_drag_and_drop_host.h',
@@ -130,6 +128,8 @@
         'views/app_list_view.cc',
         'views/app_list_view.h',
         'views/app_list_view_observer.h',
+        'views/apps_container_view.cc',
+        'views/apps_container_view.h',
         'views/apps_grid_view.cc',
         'views/apps_grid_view.h',
         'views/apps_grid_view_delegate.h',
@@ -160,9 +160,9 @@
         'views/search_result_container_view.h',
         'views/search_result_list_view.cc',
         'views/search_result_list_view.h',
+        'views/search_result_list_view_delegate.h',
         'views/search_result_page_view.cc',
         'views/search_result_page_view.h',
-        'views/search_result_list_view_delegate.h',
         'views/search_result_tile_item_list_view.cc',
         'views/search_result_tile_item_list_view.h',
         'views/search_result_tile_item_view.cc',
@@ -254,7 +254,6 @@
         # Note: sources list duplicated in GN build.
         'app_list_item_list_unittest.cc',
         'app_list_model_unittest.cc',
-        'pagination_model_unittest.cc',
         'cocoa/app_list_view_controller_unittest.mm',
         'cocoa/app_list_window_controller_unittest.mm',
         'cocoa/apps_grid_controller_unittest.mm',
@@ -263,6 +262,7 @@
         'cocoa/test/apps_grid_controller_test_helper.h',
         'cocoa/test/apps_grid_controller_test_helper.mm',
         'folder_image_unittest.cc',
+        'pagination_model_unittest.cc',
         'search/history_data_store_unittest.cc',
         'search/mixer_unittest.cc',
         'search/term_break_iterator_unittest.cc',

diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
@@ -29,15 +29,38 @@
         'AURA_IMPLEMENTATION',
       ],
       'sources': [
+        '../wm/public/activation_change_observer.cc',
+        '../wm/public/activation_change_observer.h',
+        '../wm/public/activation_client.cc',
+        '../wm/public/activation_client.h',
+        '../wm/public/activation_delegate.cc',
+        '../wm/public/activation_delegate.h',
+        '../wm/public/animation_host.cc',
+        '../wm/public/animation_host.h',
+        '../wm/public/dispatcher_client.cc',
+        '../wm/public/dispatcher_client.h',
+        '../wm/public/drag_drop_client.cc',
+        '../wm/public/drag_drop_client.h',
+        '../wm/public/drag_drop_delegate.cc',
+        '../wm/public/drag_drop_delegate.h',
+        '../wm/public/scoped_tooltip_disabler.cc',
+        '../wm/public/scoped_tooltip_disabler.h',
+        '../wm/public/tooltip_client.cc',
+        '../wm/public/tooltip_client.h',
+        '../wm/public/transient_window_client.cc',
+        '../wm/public/transient_window_client.h',
+        '../wm/public/window_move_client.cc',
+        '../wm/public/window_move_client.h',
+        '../wm/public/window_types.h',
         'client/aura_constants.cc',
         'client/aura_constants.h',
         'client/capture_client.cc',
         'client/capture_client.h',
         'client/capture_delegate.h',
         'client/cursor_client.cc',
         'client/cursor_client.h',
-        'client/cursor_client_observer.h',
         'client/cursor_client_observer.cc',
+        'client/cursor_client_observer.h',
         'client/default_capture_client.cc',
         'client/default_capture_client.h',
         'client/event_client.cc',
@@ -69,9 +92,9 @@
         'scoped_window_targeter.h',
         'window.cc',
         'window.h',
+        'window_delegate.h',
         'window_event_dispatcher.cc',
         'window_event_dispatcher.h',
-        'window_delegate.h',
         'window_layer_type.h',
         'window_observer.cc',
         'window_observer.h',
@@ -81,38 +104,15 @@
         'window_tracker.h',
         'window_tree_host.cc',
         'window_tree_host.h',
-        'window_tree_host_mac.mm',
         'window_tree_host_mac.h',
+        'window_tree_host_mac.mm',
         'window_tree_host_observer.h',
         'window_tree_host_ozone.cc',
         'window_tree_host_ozone.h',
         'window_tree_host_win.cc',
         'window_tree_host_win.h',
         'window_tree_host_x11.cc',
         'window_tree_host_x11.h',
-        '../wm/public/activation_change_observer.h',
-        '../wm/public/activation_change_observer.cc',
-        '../wm/public/activation_client.cc',
-        '../wm/public/activation_client.h',
-        '../wm/public/activation_delegate.cc',
-        '../wm/public/activation_delegate.h',
-        '../wm/public/animation_host.cc',
-        '../wm/public/animation_host.h',
-        '../wm/public/dispatcher_client.cc',
-        '../wm/public/dispatcher_client.h',
-        '../wm/public/drag_drop_client.cc',
-        '../wm/public/drag_drop_client.h',
-        '../wm/public/drag_drop_delegate.cc',
-        '../wm/public/drag_drop_delegate.h',
-        '../wm/public/scoped_tooltip_disabler.cc',
-        '../wm/public/scoped_tooltip_disabler.h',
-        '../wm/public/tooltip_client.cc',
-        '../wm/public/tooltip_client.h',
-        '../wm/public/transient_window_client.cc',
-        '../wm/public/transient_window_client.h',
-        '../wm/public/window_move_client.cc',
-        '../wm/public/window_move_client.h',
-        '../wm/public/window_types.h',
       ],
       'conditions': [
         ['use_x11==1', {
@@ -180,12 +180,12 @@
         'test/test_focus_client.h',
         'test/test_screen.cc',
         'test/test_screen.h',
+        'test/test_window_delegate.cc',
+        'test/test_window_delegate.h',
         'test/test_window_tree_client.cc',
         'test/test_window_tree_client.h',
         'test/test_windows.cc',
         'test/test_windows.h',
-        'test/test_window_delegate.cc',
-        'test/test_window_delegate.h',
         'test/ui_controls_factory_aura.h',
         'test/ui_controls_factory_aurawin.cc',
         'test/ui_controls_factory_aurax11.cc',
@@ -292,8 +292,8 @@
       ],
       'sources': [
         'gestures/gesture_recognizer_unittest.cc',
-        'window_event_dispatcher_unittest.cc',
         'test/run_all_unittests.cc',
+        'window_event_dispatcher_unittest.cc',
         'window_targeter_unittest.cc',
         'window_unittest.cc',
       ],

diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
@@ -157,11 +157,11 @@
         'default_theme_provider.cc',
         'default_theme_provider.h',
         'default_theme_provider_mac.mm',
+        'device_form_factor.h',
         'device_form_factor_android.cc',
         'device_form_factor_android.h',
         'device_form_factor_desktop.cc',
         'device_form_factor_ios.mm',
-        'device_form_factor.h',
         'dragdrop/cocoa_dnd_util.h',
         'dragdrop/cocoa_dnd_util.mm',
         'dragdrop/drag_drop_types.h',
@@ -193,8 +193,8 @@
         'font_helper_chromeos.h',
         'hit_test.h',
         'idle/idle.cc',
-        'idle/idle_chromeos.cc',
         'idle/idle.h',
+        'idle/idle_chromeos.cc',
         'idle/idle_linux.cc',
         'idle/idle_mac.mm',
         'idle/idle_query_x11.cc',

diff --git a/ui/base/ui_base_tests.gyp b/ui/base/ui_base_tests.gyp
@@ -34,11 +34,11 @@
       # are built on iOS.
       'common_sources' : [
         # Note: file list duplicated in GN build.
-        'layout_unittest.cc',
         'l10n/l10n_util_mac_unittest.mm',
         'l10n/l10n_util_unittest.cc',
         'l10n/l10n_util_win_unittest.cc',
         'l10n/time_format_unittest.cc',
+        'layout_unittest.cc',
         'models/tree_node_iterator_unittest.cc',
         'resource/data_pack_literal.cc',
         'resource/data_pack_unittest.cc',
@@ -77,8 +77,8 @@
         'models/list_model_unittest.cc',
         'models/list_selection_model_unittest.cc',
         'models/tree_node_model_unittest.cc',
-        'test/test_clipboard_unittest.cc',
         'test/data/resource.h',
+        'test/test_clipboard_unittest.cc',
         'text/bytes_formatting_unittest.cc',
         'touch/selection_bound_unittest.cc',
         'user_activity/user_activity_detector_unittest.cc',
@@ -215,8 +215,8 @@
         ['use_x11==0', {
           'sources!': [
             'ime/chromeos/character_composer_unittest.cc',
-            'ime/input_method_chromeos_unittest.cc',
             'ime/composition_text_util_pango_unittest.cc',
+            'ime/input_method_chromeos_unittest.cc',
           ],
         }],
       ],

diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
@@ -32,10 +32,10 @@
         'compositor_animation_observer.h',
         'compositor_export.h',
         'compositor_observer.h',
-        'compositor_vsync_manager.cc',
-        'compositor_vsync_manager.h',
         'compositor_switches.cc',
         'compositor_switches.h',
+        'compositor_vsync_manager.cc',
+        'compositor_vsync_manager.h',
         'debug_utils.cc',
         'debug_utils.h',
         'dip_util.cc',

diff --git a/ui/events/events.gyp b/ui/events/events.gyp
@@ -131,15 +131,15 @@
         'gestures/gesture_types.h',
         'gestures/motion_event_aura.cc',
         'gestures/motion_event_aura.h',
+        'linux/text_edit_command_auralinux.cc',
+        'linux/text_edit_command_auralinux.h',
+        'linux/text_edit_key_bindings_delegate_auralinux.cc',
+        'linux/text_edit_key_bindings_delegate_auralinux.h',
         'null_event_targeter.cc',
         'null_event_targeter.h',
         'ozone/events_ozone.cc',
         'win/events_win.cc',
         'x/events_x.cc',
-        'linux/text_edit_command_auralinux.cc',
-        'linux/text_edit_command_auralinux.h',
-        'linux/text_edit_key_bindings_delegate_auralinux.cc',
-        'linux/text_edit_key_bindings_delegate_auralinux.h',
       ],
       'conditions': [
         ['use_x11==1', {
@@ -217,8 +217,8 @@
         'gesture_detection/gesture_listeners.h',
         'gesture_detection/gesture_provider.cc',
         'gesture_detection/gesture_provider.h',
-        "gesture_detection/gesture_provider_config_helper.cc",
-        "gesture_detection/gesture_provider_config_helper.h",
+        'gesture_detection/gesture_provider_config_helper.cc',
+        'gesture_detection/gesture_provider_config_helper.h',
         'gesture_detection/gesture_touch_uma_histogram.cc',
         'gesture_detection/gesture_touch_uma_histogram.h',
         'gesture_detection/motion_event.cc',
@@ -235,10 +235,10 @@
         'gesture_detection/snap_scroll_controller.h',
         'gesture_detection/touch_disposition_gesture_filter.cc',
         'gesture_detection/touch_disposition_gesture_filter.h',
-        'gesture_detection/velocity_tracker_state.cc',
-        'gesture_detection/velocity_tracker_state.h',
         'gesture_detection/velocity_tracker.cc',
         'gesture_detection/velocity_tracker.h',
+        'gesture_detection/velocity_tracker_state.cc',
+        'gesture_detection/velocity_tracker_state.h',
       ],
       'conditions': [
         ['use_aura!=1 and OS!="android"', {

diff --git a/ui/events/latency_info_nacl.gyp b/ui/events/latency_info_nacl.gyp
@@ -35,10 +35,10 @@
             'build_nonsfi_helper': 1,
           },
           'sources': [
-            'latency_info.cc',
-            'latency_info.h',
             'ipc/latency_info_param_traits.cc',
             'ipc/latency_info_param_traits.h',
+            'latency_info.cc',
+            'latency_info.h',
           ],
         },
       ],
@@ -64,10 +64,10 @@
             '../..',
           ],
           'sources': [
-            'latency_info.cc',
-            'latency_info.h',
             'ipc/latency_info_param_traits.cc',
             'ipc/latency_info_param_traits.h',
+            'latency_info.cc',
+            'latency_info.h',
           ],
           'configurations': {
             'Common_Base': {

diff --git a/ui/events/ozone/events_ozone.gyp b/ui/events/ozone/events_ozone.gyp
@@ -67,16 +67,6 @@
       ],
     },
     'sources': [
-      'evdev/libgestures_glue/event_reader_libevdev_cros.cc',
-      'evdev/libgestures_glue/event_reader_libevdev_cros.h',
-      'evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc',
-      'evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h',
-      'evdev/libgestures_glue/gesture_logging.cc',
-      'evdev/libgestures_glue/gesture_logging.h',
-      'evdev/libgestures_glue/gesture_property_provider.cc',
-      'evdev/libgestures_glue/gesture_property_provider.h',
-      'evdev/libgestures_glue/gesture_timer_provider.cc',
-      'evdev/libgestures_glue/gesture_timer_provider.h',
       'evdev/device_event_dispatcher_evdev.cc',
       'evdev/device_event_dispatcher_evdev.h',
       'evdev/event_converter_evdev.cc',
@@ -104,6 +94,16 @@
       'evdev/keyboard_evdev.h',
       'evdev/keyboard_util_evdev.cc',
       'evdev/keyboard_util_evdev.h',
+      'evdev/libgestures_glue/event_reader_libevdev_cros.cc',
+      'evdev/libgestures_glue/event_reader_libevdev_cros.h',
+      'evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc',
+      'evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h',
+      'evdev/libgestures_glue/gesture_logging.cc',
+      'evdev/libgestures_glue/gesture_logging.h',
+      'evdev/libgestures_glue/gesture_property_provider.cc',
+      'evdev/libgestures_glue/gesture_property_provider.h',
+      'evdev/libgestures_glue/gesture_timer_provider.cc',
+      'evdev/libgestures_glue/gesture_timer_provider.h',
       'evdev/mouse_button_map_evdev.cc',
       'evdev/mouse_button_map_evdev.h',
       'evdev/tablet_event_converter_evdev.cc',
@@ -171,6 +171,7 @@
           ],
         },
         'sources': [
+          'layout/xkb/scoped_xkb.h',
           'layout/xkb/xkb.h',
           'layout/xkb/xkb_evdev_codes.cc',
           'layout/xkb/xkb_evdev_codes.h',
@@ -180,7 +181,6 @@
           'layout/xkb/xkb_keyboard_layout_engine.cc',
           'layout/xkb/xkb_keyboard_layout_engine.h',
           'layout/xkb/xkb_keysym.h',
-          'layout/xkb/scoped_xkb.h',
         ],
       }],
     ],