| OLD | NEW | 
|     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|     2 # |     2 # | 
|     3 # Use of this source code is governed by a BSD-style license that can be |     3 # Use of this source code is governed by a BSD-style license that can be | 
|     4 # found in the LICENSE file. |     4 # found in the LICENSE file. | 
|     5  |     5  | 
|     6 { |     6 { | 
|     7   'targets': [ |     7   'targets': [ | 
|     8     { |     8     { | 
|     9       'target_name': 'browser_ui', |     9       'target_name': 'browser_ui', | 
|    10       'type': 'static_library', |    10       'type': 'static_library', | 
|    11       'variables': { 'enable_wexit_time_destructors': 1, }, |    11       'variables': { 'enable_wexit_time_destructors': 1, }, | 
|    12       # Since browser and browser_ui actually depend on each other, |    12       # Since browser and browser_ui actually depend on each other, | 
|    13       # we must omit the dependency from browser_extensions to browser. |    13       # we must omit the dependency from browser_ui to browser. | 
|    14       # However, this means browser_ui and browser should more or less |    14       # However, this means browser_ui and browser should more or less | 
|    15       # have the same dependencies. Once browser_ui is untangled from |    15       # have the same dependencies. Once browser_ui is untangled from | 
|    16       # browser, then we can clean up these dependencies. |    16       # browser, then we can clean up these dependencies. | 
|    17       'dependencies': [ |    17       'dependencies': [ | 
 |    18         # NOTE: New dependencies should generally be added in the OS!="ios" | 
 |    19         # dependencies block below, rather than here. | 
|    18         'app/policy/cloud_policy_codegen.gyp:policy', |    20         'app/policy/cloud_policy_codegen.gyp:policy', | 
|    19         'autofill_regexes', |  | 
|    20         'browser_extensions', |  | 
|    21         'browser/performance_monitor/performance_monitor.gyp:performance_monitor
      ', |  | 
|    22         'cert_logger_proto', |    21         'cert_logger_proto', | 
|    23         'chrome_resources.gyp:chrome_extra_resources', |    22         'chrome_resources.gyp:chrome_extra_resources', | 
|    24         'chrome_resources.gyp:chrome_resources', |    23         'chrome_resources.gyp:chrome_resources', | 
|    25         'chrome_resources.gyp:chrome_strings', |    24         'chrome_resources.gyp:chrome_strings', | 
|    26         'chrome_resources.gyp:platform_locale_settings', |    25         'chrome_resources.gyp:platform_locale_settings', | 
|    27         'chrome_resources.gyp:theme_resources', |    26         'chrome_resources.gyp:theme_resources', | 
|    28         'common', |    27         'common', | 
|    29         'common/extensions/api/api.gyp:api', |  | 
|    30         'common_net', |    28         'common_net', | 
|    31         'debugger', |  | 
|    32         'in_memory_url_index_cache_proto', |    29         'in_memory_url_index_cache_proto', | 
|    33         'installer_util', |  | 
|    34         'safe_browsing_proto', |    30         'safe_browsing_proto', | 
|    35         'safe_browsing_report_proto', |    31         'safe_browsing_report_proto', | 
|    36         'feedback_proto', |    32         'feedback_proto', | 
|    37         'variations_seed_proto', |    33         'variations_seed_proto', | 
|    38         '../build/temp_gyp/googleurl.gyp:googleurl', |    34         '../build/temp_gyp/googleurl.gyp:googleurl', | 
|    39         '../content/content.gyp:content_browser', |    35         '../content/content.gyp:content_browser', | 
|    40         '../content/content.gyp:content_common', |    36         '../content/content.gyp:content_common', | 
|    41         '../crypto/crypto.gyp:crypto', |    37         '../crypto/crypto.gyp:crypto', | 
|    42         '../device/device.gyp:device_bluetooth', |  | 
|    43         '../media/media.gyp:media', |    38         '../media/media.gyp:media', | 
|    44         '../net/net.gyp:net_with_v8', |  | 
|    45         '../ppapi/ppapi_internal.gyp:ppapi_ipc',  # For PpapiMsg_LoadPlugin |  | 
|    46         '../printing/printing.gyp:printing', |  | 
|    47         '../skia/skia.gyp:skia', |    39         '../skia/skia.gyp:skia', | 
|    48         '../sync/protocol/sync_proto.gyp:sync_proto', |    40         '../sync/protocol/sync_proto.gyp:sync_proto', | 
|    49         # TODO(akalin): Depend only on syncapi_service from sync. |    41         # TODO(akalin): Depend only on syncapi_service from sync. | 
|    50         '../sync/sync.gyp:syncapi_core', |    42         '../sync/sync.gyp:syncapi_core', | 
|    51         '../sync/sync.gyp:syncapi_service', |    43         '../sync/sync.gyp:syncapi_service', | 
|    52         '../sync/sync.gyp:sync_notifier', |    44         '../sync/sync.gyp:sync_notifier', | 
|    53         '../third_party/adobe/flash/flash_player.gyp:flapper_version_h', |  | 
|    54         '../third_party/bzip2/bzip2.gyp:bzip2', |    45         '../third_party/bzip2/bzip2.gyp:bzip2', | 
|    55         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio
      n', |    46         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio
      n', | 
|    56         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio
      n_proto_cpp', |    47         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio
      n_proto_cpp', | 
|    57         '../third_party/cld/cld.gyp:cld', |  | 
|    58         '../third_party/expat/expat.gyp:expat', |  | 
|    59         '../third_party/hunspell/hunspell.gyp:hunspell', |  | 
|    60         '../third_party/icu/icu.gyp:icui18n', |    48         '../third_party/icu/icu.gyp:icui18n', | 
|    61         '../third_party/icu/icu.gyp:icuuc', |    49         '../third_party/icu/icu.gyp:icuuc', | 
|    62         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |  | 
|    63         '../third_party/libjingle/libjingle.gyp:libjingle', |  | 
|    64         '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', |  | 
|    65         '../third_party/libusb/libusb.gyp:libusb', |    50         '../third_party/libusb/libusb.gyp:libusb', | 
|    66         '../third_party/libxml/libxml.gyp:libxml', |    51         '../third_party/libxml/libxml.gyp:libxml', | 
|    67         '../third_party/npapi/npapi.gyp:npapi', |  | 
|    68         '../third_party/re2/re2.gyp:re2', |  | 
|    69         '../third_party/zlib/zlib.gyp:zlib', |    52         '../third_party/zlib/zlib.gyp:zlib', | 
|    70         '../ui/base/strings/ui_strings.gyp:ui_strings', |    53         '../ui/base/strings/ui_strings.gyp:ui_strings', | 
|    71         '../ui/compositor/compositor.gyp:compositor', |  | 
|    72         '../ui/surface/surface.gyp:surface', |  | 
|    73         '../ui/ui.gyp:ui', |    54         '../ui/ui.gyp:ui', | 
|    74         '../ui/ui.gyp:ui_resources', |    55         '../ui/ui.gyp:ui_resources', | 
|    75         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', |  | 
|    76         '../v8/tools/gyp/v8.gyp:v8', |  | 
|    77         '../webkit/support/webkit_support.gyp:glue', |  | 
|    78         '../webkit/support/webkit_support.gyp:user_agent', |    56         '../webkit/support/webkit_support.gyp:user_agent', | 
|    79         '../webkit/support/webkit_support.gyp:webkit_resources', |  | 
|    80         '../webkit/support/webkit_support.gyp:webkit_storage', |  | 
|    81       ], |    57       ], | 
|    82       'include_dirs': [ |    58       'include_dirs': [ | 
|    83         '..', |    59         '..', | 
|    84         '<(INTERMEDIATE_DIR)', |    60         '<(INTERMEDIATE_DIR)', | 
|    85         # Needed by pepper_flash_component_installer.cc. |    61         # Needed by pepper_flash_component_installer.cc. | 
|    86         '<(SHARED_INTERMEDIATE_DIR)', |    62         '<(SHARED_INTERMEDIATE_DIR)', | 
|    87       ], |    63       ], | 
|    88       'defines': [ |  | 
|    89         '<@(nacl_defines)', |  | 
|    90       ], |  | 
|    91       'direct_dependent_settings': { |  | 
|    92         'defines': [ |  | 
|    93           '<@(nacl_defines)', |  | 
|    94         ], |  | 
|    95       }, |  | 
|    96       'export_dependent_settings': [ |    64       'export_dependent_settings': [ | 
|    97         '../sync/sync.gyp:sync_notifier', |    65         '../sync/sync.gyp:sync_notifier', | 
|    98       ], |    66       ], | 
|    99       'sources': [ |    67       'sources': [ | 
|   100         # All .cc, .h, .m, and .mm files under browser/ui except for: |    68         # All .cc, .h, .m, and .mm files under browser/ui except for: | 
|   101         # * tests and mocks. |    69         # * tests and mocks. | 
|   102         'browser/ui/alternate_error_tab_observer.cc', |    70         'browser/ui/alternate_error_tab_observer.cc', | 
|   103         'browser/ui/alternate_error_tab_observer.h', |    71         'browser/ui/alternate_error_tab_observer.h', | 
|   104         'browser/ui/android/android_about_app_info.cc', |    72         'browser/ui/android/android_about_app_info.cc', | 
|   105         'browser/ui/android/android_about_app_info.h', |    73         'browser/ui/android/android_about_app_info.h', | 
| (...skipping 2001 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2107         'browser/ui/window_snapshot/window_snapshot.h', |  2075         'browser/ui/window_snapshot/window_snapshot.h', | 
|  2108         'browser/ui/window_snapshot/window_snapshot_aura.cc', |  2076         'browser/ui/window_snapshot/window_snapshot_aura.cc', | 
|  2109         'browser/ui/window_snapshot/window_snapshot_gtk.cc', |  2077         'browser/ui/window_snapshot/window_snapshot_gtk.cc', | 
|  2110         'browser/ui/window_snapshot/window_snapshot_mac.mm', |  2078         'browser/ui/window_snapshot/window_snapshot_mac.mm', | 
|  2111         'browser/ui/window_snapshot/window_snapshot_win.cc', |  2079         'browser/ui/window_snapshot/window_snapshot_win.cc', | 
|  2112         'browser/ui/zoom/zoom_controller.cc', |  2080         'browser/ui/zoom/zoom_controller.cc', | 
|  2113         'browser/ui/zoom/zoom_controller.h', |  2081         'browser/ui/zoom/zoom_controller.h', | 
|  2114         'browser/ui/zoom/zoom_observer.h', |  2082         'browser/ui/zoom/zoom_observer.h', | 
|  2115       ], |  2083       ], | 
|  2116       'conditions': [ |  2084       'conditions': [ | 
 |  2085         ['OS != "ios"', { | 
 |  2086           'dependencies': [ | 
 |  2087             'autofill_regexes', | 
 |  2088             'browser_extensions', | 
 |  2089             'browser/performance_monitor/performance_monitor.gyp:performance_mon
      itor', | 
 |  2090             'common/extensions/api/api.gyp:api', | 
 |  2091             'debugger', | 
 |  2092             'installer_util', | 
 |  2093             '../device/device.gyp:device_bluetooth', | 
 |  2094             '../net/net.gyp:net_with_v8', | 
 |  2095             '../ppapi/ppapi_internal.gyp:ppapi_ipc',  # For PpapiMsg_LoadPlugin | 
 |  2096             '../printing/printing.gyp:printing', | 
 |  2097             '../third_party/adobe/flash/flash_player.gyp:flapper_version_h', | 
 |  2098             '../third_party/cld/cld.gyp:cld', | 
 |  2099             '../third_party/expat/expat.gyp:expat', | 
 |  2100             '../third_party/hunspell/hunspell.gyp:hunspell', | 
 |  2101             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', | 
 |  2102             '../third_party/libjingle/libjingle.gyp:libjingle', | 
 |  2103             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', | 
 |  2104             '../third_party/npapi/npapi.gyp:npapi', | 
 |  2105             '../third_party/re2/re2.gyp:re2', | 
 |  2106             '../ui/compositor/compositor.gyp:compositor', | 
 |  2107             '../ui/surface/surface.gyp:surface', | 
 |  2108             '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', | 
 |  2109             '../v8/tools/gyp/v8.gyp:v8', | 
 |  2110             '../webkit/support/webkit_support.gyp:glue', | 
 |  2111             '../webkit/support/webkit_support.gyp:webkit_storage', | 
 |  2112             '../webkit/support/webkit_support.gyp:webkit_resources', | 
 |  2113           ], | 
 |  2114           'defines': [ | 
 |  2115             '<@(nacl_defines)', | 
 |  2116           ], | 
 |  2117           'direct_dependent_settings': { | 
 |  2118             'defines': [ | 
 |  2119               '<@(nacl_defines)', | 
 |  2120             ], | 
 |  2121           }, | 
 |  2122         }, {  # OS == "ios" | 
 |  2123           'dependencies': [ | 
 |  2124             '../net/net.gyp:net', | 
 |  2125           ], | 
 |  2126           'sources/': [ | 
 |  2127             # iOS uses only small portions of browser/ui/. | 
 |  2128             ['exclude', '\\.(cc|mm)$'], | 
 |  2129             ['include', '_ios\\.(cc|mm)$'], | 
 |  2130             ['include', '(^|/)ios/'], | 
 |  2131             # TODO(ios): Add files here as they are updated to compile on iOS. | 
 |  2132           ], | 
 |  2133         }], | 
|  2117         ['enable_one_click_signin==0', { |  2134         ['enable_one_click_signin==0', { | 
|  2118           'sources!': [ |  2135           'sources!': [ | 
|  2119             'browser/ui/cocoa/one_click_signin_bubble_controller.h', |  2136             'browser/ui/cocoa/one_click_signin_bubble_controller.h', | 
|  2120             'browser/ui/cocoa/one_click_signin_bubble_controller.mm', |  2137             'browser/ui/cocoa/one_click_signin_bubble_controller.mm', | 
|  2121             'browser/ui/gtk/one_click_signin_bubble_gtk.cc', |  2138             'browser/ui/gtk/one_click_signin_bubble_gtk.cc', | 
|  2122             'browser/ui/gtk/one_click_signin_bubble_gtk.h', |  2139             'browser/ui/gtk/one_click_signin_bubble_gtk.h', | 
|  2123             'browser/ui/sync/one_click_signin_helper.cc', |  2140             'browser/ui/sync/one_click_signin_helper.cc', | 
|  2124             'browser/ui/sync/one_click_signin_helper.h', |  2141             'browser/ui/sync/one_click_signin_helper.h', | 
|  2125             'browser/ui/sync/one_click_signin_histogram.h', |  2142             'browser/ui/sync/one_click_signin_histogram.h', | 
|  2126             'browser/ui/sync/one_click_signin_sync_starter.cc', |  2143             'browser/ui/sync/one_click_signin_sync_starter.cc', | 
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2344             ['exclude', '^browser/ui/webui/gesture_config_ui.cc'], |  2361             ['exclude', '^browser/ui/webui/gesture_config_ui.cc'], | 
|  2345             ['exclude', '^browser/ui/webui/gesture_config_ui.h'], |  2362             ['exclude', '^browser/ui/webui/gesture_config_ui.h'], | 
|  2346             ['exclude', '^browser/ui/webui/task_manager/'], |  2363             ['exclude', '^browser/ui/webui/task_manager/'], | 
|  2347           ], |  2364           ], | 
|  2348         }], |  2365         }], | 
|  2349         ['ui_compositor_image_transport==1', { |  2366         ['ui_compositor_image_transport==1', { | 
|  2350           'dependencies': [ |  2367           'dependencies': [ | 
|  2351             '../ui/gl/gl.gyp:gl', |  2368             '../ui/gl/gl.gyp:gl', | 
|  2352           ], |  2369           ], | 
|  2353         }], |  2370         }], | 
|  2354         ['os_posix == 1 and OS != "mac" and OS != "android"', { |  2371         ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { | 
|  2355           'link_settings': { |  2372           'link_settings': { | 
|  2356             'libraries': [ |  2373             'libraries': [ | 
|  2357               '-lXss', |  2374               '-lXss', | 
|  2358             ], |  2375             ], | 
|  2359           }, |  2376           }, | 
|  2360         }], |  2377         }], | 
|  2361         ['use_nss!=1', { |  2378         ['use_nss!=1', { | 
|  2362           'sources!': [ |  2379           'sources!': [ | 
|  2363             'browser/ui/webui/options/certificate_manager_handler.cc', |  2380             'browser/ui/webui/options/certificate_manager_handler.cc', | 
|  2364             'browser/ui/webui/options/certificate_manager_handler.h', |  2381             'browser/ui/webui/options/certificate_manager_handler.h', | 
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2733             ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'], |  2750             ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'], | 
|  2734             ['exclude', '^browser/ui/views/select_file_dialog_extension.h'], |  2751             ['exclude', '^browser/ui/views/select_file_dialog_extension.h'], | 
|  2735             ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.
      cc'], |  2752             ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.
      cc'], | 
|  2736             ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.
      h'], |  2753             ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.
      h'], | 
|  2737           ]} |  2754           ]} | 
|  2738         ], |  2755         ], | 
|  2739       ], |  2756       ], | 
|  2740     }, |  2757     }, | 
|  2741   ], |  2758   ], | 
|  2742 } |  2759 } | 
| OLD | NEW |