Chromium Code Reviews Chromium Code Reviews
Issue 11307015:
Upstream changes to chrome_browser.gypi. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: chrome/chrome_browser.gypi |
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
| index 7148e3874c67220bf1ff49f03d319be9e98b5649..a4763a716fe70557ac3a6848a48aa2ac6f1decc4 100644 |
| --- a/chrome/chrome_browser.gypi |
| +++ b/chrome/chrome_browser.gypi |
| @@ -2547,11 +2547,16 @@ |
| 'browser/component/components.gyp:web_contents_delegate_android', |
| 'chrome_browser_jni_headers', |
| ], |
| + 'dependencies!': [ |
| + 'safe_browsing_report_proto', |
|
nilesh
2012/10/26 22:45:28
This is already excluded if safe_browsing == 0
exc
shashi
2012/10/29 17:54:55
Done.
|
| + ], |
| 'sources': [ |
| 'browser/web_resource/notification_promo_mobile_ntp.cc', |
| 'browser/web_resource/notification_promo_mobile_ntp.h', |
| ], |
| 'sources!': [ |
| + 'browser/autocomplete/autocomplete_edit.cc', |
| + 'browser/bookmarks/bookmark_drop_info.cc', |
| # Bookmark export/import are handled via the BookmarkColumns |
| # ContentProvider. |
| 'browser/bookmarks/bookmark_html_writer.cc', |
| @@ -2574,6 +2579,29 @@ |
| 'browser/net/gaia/gaia_oauth_fetcher.cc', |
| 'browser/page_cycler/page_cycler.cc', |
| 'browser/page_cycler/page_cycler.h', |
| + 'browser/ui/uma_browsing_activity_observer.cc', |
| + 'browser/ui/uma_browsing_activity_observer.h', |
| + # display_utils_posix uses the gdk.h header which is not available |
| + # on Android. |
| + 'browser/metrics/display_utils_posix.cc', |
|
sky
2012/10/26 23:19:51
Keep things sorted.
shashi
2012/10/29 17:54:55
Done.
|
| + 'browser/omnibox_search_hint.cc', |
| + '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/ui/webui/bookmarks_ui.cc', |
| + 'browser/ui/webui/bookmarks_ui.h', |
| + 'browser/ui/webui/html_dialog_tab_contents_delegate.cc', |
| + 'browser/ui/webui/tracing_ui.cc', |
| + 'browser/ui/webui/tracing_ui.h', |
| 'browser/upgrade_detector.cc', |
| 'browser/upgrade_detector.h', |
| 'browser/upgrade_detector_impl.cc', |
| @@ -2586,6 +2614,7 @@ |
| ], |
| 'sources/': [ |
| ['exclude', '^browser/captive_portal/'], |
| + ['exclude', '^browser/background/'], |
| ['exclude', '^browser/chrome_to_mobile'], |
| ['exclude', '^browser/first_run/'], |
| ['include', '^browser/first_run/first_run.cc'], # For ctor/dtor of a struct. |
| @@ -2595,6 +2624,7 @@ |
| ['exclude', '^browser/speech/'], |
| ['exclude', '^browser/sync/glue/app_'], |
| ['exclude', '^browser/sync/glue/extension_'], |
| + ['exclude', '^browser/sync/glue/theme_'], |
| ['exclude', '^browser/usb/'], |
| ], |
| }], |
