diff options
| -rw-r--r-- | chrome/chrome_browser.gypi | 16 | ||||
| -rw-r--r-- | chrome/chrome_browser_ui.gypi | 9 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 1 |
3 files changed, 25 insertions, 1 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index a01c7bb..45b7bed 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2285,6 +2285,7 @@ ], }, { # safe_browsing==0 'dependencies!': [ + 'safe_browsing_proto', 'safe_browsing_report_proto', '../third_party/libusb/libusb.gyp:libusb', ], @@ -2567,6 +2568,7 @@ 'browser/web_resource/notification_promo_mobile_ntp.h', ], 'sources!': [ + 'browser/bookmarks/bookmark_drop_info.cc', # Bookmark export/import are handled via the BookmarkColumns # ContentProvider. 'browser/bookmarks/bookmark_html_writer.cc', @@ -2587,12 +2589,25 @@ 'browser/managed_mode/managed_mode_url_filter.cc', 'browser/managed_mode/managed_mode_url_filter.h', 'browser/net/gaia/gaia_oauth_fetcher.cc', + 'browser/omnibox_search_hint.cc', 'browser/page_cycler/page_cycler.cc', 'browser/page_cycler/page_cycler.h', 'browser/sessions/persistent_tab_restore_service.cc', 'browser/sessions/persistent_tab_restore_service.h', 'browser/sessions/session_backend.cc', 'browser/sessions/session_backend.h', + 'browser/tab_contents/background_contents.cc', + 'browser/tab_contents/background_contents.h', + 'browser/tab_contents/render_view_context_menu.cc', + 'browser/tab_contents/render_view_context_menu.h', + 'browser/tab_contents/render_view_context_menu_observer.cc', + 'browser/tab_contents/render_view_context_menu_observer.h', + 'browser/tab_contents/spellchecker_submenu_observer.h', + 'browser/tab_contents/spellchecker_submenu_observer_hunspell.cc', + 'browser/tab_contents/spelling_bubble_model.cc', + 'browser/tab_contents/spelling_bubble_model.h', + 'browser/tab_contents/spelling_menu_observer.cc', + 'browser/tab_contents/spelling_menu_observer.h', 'browser/upgrade_detector.cc', 'browser/upgrade_detector.h', 'browser/upgrade_detector_impl.cc', @@ -2614,6 +2629,7 @@ ['exclude', '^browser/speech/'], ['exclude', '^browser/sync/glue/app_'], ['exclude', '^browser/sync/glue/extension_'], + ['exclude', '^browser/sync/glue/theme_'], ['exclude', '^browser/usb/'], ], }], diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 2e0f539..65df02b 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -2167,6 +2167,7 @@ ], }, { # safe_browsing==0 'dependencies!': [ + 'safe_browsing_proto', 'safe_browsing_report_proto', '../third_party/libusb/libusb.gyp:libusb', ], @@ -2450,11 +2451,15 @@ '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', @@ -2480,6 +2485,8 @@ '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', ], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 68b53de..062abaf 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2633,6 +2633,7 @@ 'browser/sync/profile_sync_service_session_unittest.cc', 'browser/sync/sync_global_error_unittest.cc', 'browser/sync/sync_setup_wizard_unittest.cc', + 'browser/tab_contents/render_view_context_menu_unittest.cc', 'browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc', 'browser/ui/browser_command_controller_unittest.cc', 'browser/ui/fullscreen/fullscreen_controller_unittest.cc', |