Upstream changes to chrome_browser.gypi.

chrome/chrome_browser_ui.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser_ui',
       'type': 'static_library',
@@ skipping 2149 matching lines @@
             ['exclude', 'browser/ui/webui/policy_ui.cc'],
             ['exclude', 'browser/ui/webui/policy_ui.h'],
           ],
         }],
         ['safe_browsing==1', {
           'defines': [
             'ENABLE_SAFE_BROWSING',
           ],
         }, {  # safe_browsing==0
           'dependencies!': [
+            'safe_browsing_proto',
             'safe_browsing_report_proto',
             '../third_party/libusb/libusb.gyp:libusb',
           ],
         }],
         ['toolkit_views == 0', {
           'sources!': [
             'browser/ui/tabs/tab_strip_layout_type.h',
             'browser/ui/tabs/tab_strip_layout_type_prefs.cc',
             'browser/ui/tabs/tab_strip_layout_type_prefs.h',
           ],
@@ skipping 262 matching lines @@
             'browser/ui/chrome_pages.h',
             'browser/ui/ntp_background_util.cc',
             'browser/ui/ntp_background_util.h',
             'browser/ui/sad_tab_helper.cc',
             'browser/ui/search/other_device_menu_controller.cc',
             'browser/ui/search/other_device_menu_controller.h',
             'browser/ui/singleton_tabs.cc',
             'browser/ui/singleton_tabs.h',
             'browser/ui/sync/browser_synced_window_delegate.cc',
             'browser/ui/tab_contents/tab_contents_iterator.cc',
+            'browser/ui/uma_browsing_activity_observer.cc',
+            'browser/ui/uma_browsing_activity_observer.h',
+            'browser/ui/webui/bookmarks_ui.cc',
+            'browser/ui/webui/bookmarks_ui.h',
             'browser/ui/webui/certificate_viewer_webui.cc',
             'browser/ui/webui/extensions/command_handler.cc',
-            'browser/ui/webui/extensions/extensions_ui.cc',
             'browser/ui/webui/extensions/extension_settings_handler.cc',
             'browser/ui/webui/extensions/extension_settings_handler.h',
+            'browser/ui/webui/extensions/extensions_ui.cc',
             'browser/ui/webui/extensions/install_extension_handler.cc',
             'browser/ui/webui/inspect_ui.cc',
             'browser/ui/webui/inspect_ui.h',
             'browser/ui/webui/ntp/app_launcher_handler.cc',
             'browser/ui/webui/ntp/app_launcher_handler.h',
             'browser/ui/webui/ntp/new_tab_page_handler.cc',
             'browser/ui/webui/ntp/new_tab_page_handler.h',
             'browser/ui/webui/ntp/ntp_resource_cache.cc',
             'browser/ui/webui/ntp/suggestions_combiner.cc',
             'browser/ui/webui/ntp/suggestions_combiner.h',
             'browser/ui/webui/ntp/suggestions_page_handler.cc',
             'browser/ui/webui/ntp/suggestions_page_handler.h',
             'browser/ui/webui/ntp/suggestions_source.h',
             'browser/ui/webui/ntp/suggestions_source_discovery.cc',
             'browser/ui/webui/ntp/suggestions_source_discovery.h',
             'browser/ui/webui/ntp/suggestions_source_top_sites.cc',
             'browser/ui/webui/ntp/suggestions_source_top_sites.h',
             'browser/ui/webui/performance_monitor/web_ui.cc',
             'browser/ui/webui/performance_monitor/web_ui_handler.cc',
             'browser/ui/webui/plugins_ui.cc',
             'browser/ui/webui/plugins_ui.h',
             'browser/ui/webui/suggestions_internals/suggestions_internals_ui.cc',
             'browser/ui/webui/suggestions_internals/suggestions_internals_ui.h',
             'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.cc',
             'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.h',
+            'browser/ui/webui/tracing_ui.cc',
+            'browser/ui/webui/tracing_ui.h',
             'browser/ui/window_sizer/window_sizer.cc',
             'browser/ui/window_sizer/window_sizer.h',
           ],
           'sources/': [
             ['exclude', '^browser/ui/intents/'],
             ['exclude', '^browser/ui/omnibox/'],
             ['exclude', '^browser/ui/panels/'],
             ['exclude', '^browser/ui/pdf/'],
             ['exclude', '^browser/ui/startup/'],
             ['exclude', '^browser/ui/tabs/'],
@@ skipping 233 matching lines @@
             ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'],
             ['exclude', '^browser/ui/views/select_file_dialog_extension.h'],
             ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.cc'],
             ['exclude', '^browser/ui/views/select_file_dialog_extension_factory.h'],
           ]}
         ],
       ],
     },
   ],
 }