Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 801643006: Enable chrome.gyp:browser_ui on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index aaf022ee4baa367155570b4ecb59fecaa7fa873b..458771dad89bfd8161a89713443322b2d652a819 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1343,7 +1343,7 @@
'browser/ui/auto_login_infobar_delegate.h',
'browser/ui/screen_capture_notification_ui_stub.cc',
],
- 'chrome_browser_ui_non_android_sources': [
+ 'chrome_browser_ui_non_mobile_sources': [
'browser/ui/apps/app_info_dialog.h',
'browser/ui/apps/apps_metro_handler_win.cc',
'browser/ui/apps/apps_metro_handler_win.h',
@@ -1377,6 +1377,8 @@
'browser/ui/browser.h',
'browser/ui/browser_command_controller.cc',
'browser/ui/browser_command_controller.h',
+ 'browser/ui/browser_commands.cc',
+ 'browser/ui/browser_commands.h',
'browser/ui/browser_content_setting_bubble_model_delegate.cc',
'browser/ui/browser_content_setting_bubble_model_delegate.h',
'browser/ui/browser_finder.cc',
@@ -1389,6 +1391,7 @@
'browser/ui/browser_otr_state.h',
'browser/ui/browser_tab_restore_service_delegate.cc',
'browser/ui/browser_tab_restore_service_delegate.h',
+ 'browser/ui/browser_tab_restorer.cc',
'browser/ui/browser_tab_strip_model_delegate.cc',
'browser/ui/browser_tab_strip_model_delegate.h',
'browser/ui/browser_tabrestore.cc',
@@ -1399,6 +1402,8 @@
'browser/ui/browser_toolbar_model_delegate.h',
'browser/ui/browser_view_prefs.cc',
'browser/ui/browser_view_prefs.h',
+ 'browser/ui/browser_window_state.cc',
+ 'browser/ui/browser_window_state.h',
'browser/ui/chrome_pages.cc',
'browser/ui/chrome_pages.h',
'browser/ui/chrome_style.cc',
@@ -1502,6 +1507,8 @@
'browser/ui/sad_tab_helper.cc',
'browser/ui/sad_tab_helper.h',
'browser/ui/sad_tab_types.h',
+ 'browser/ui/scoped_tabbed_browser_displayer.cc',
+ 'browser/ui/scoped_tabbed_browser_displayer.h',
'browser/ui/search/search_delegate.cc',
'browser/ui/search/search_delegate.h',
'browser/ui/search/search_ui.cc',
@@ -1532,6 +1539,8 @@
'browser/ui/startup/startup_types.h',
'browser/ui/sync/browser_synced_window_delegate.cc',
'browser/ui/sync/browser_synced_window_delegate.h',
+ 'browser/ui/sync/sync_promo_ui.cc',
+ 'browser/ui/sync/sync_promo_ui.h',
'browser/ui/tab_contents/tab_contents_iterator.cc',
'browser/ui/tab_contents/tab_contents_iterator.h',
'browser/ui/tab_modal_confirm_dialog_delegate.cc',
@@ -1567,15 +1576,15 @@
'browser/ui/toolbar/encoding_menu_controller.h',
'browser/ui/toolbar/recent_tabs_sub_menu_model.cc',
'browser/ui/toolbar/recent_tabs_sub_menu_model.h',
+ 'browser/ui/toolbar/toolbar_action_view_controller.h',
+ 'browser/ui/toolbar/toolbar_action_view_delegate.h',
'browser/ui/toolbar/toolbar_actions_bar.cc',
'browser/ui/toolbar/toolbar_actions_bar.h',
'browser/ui/toolbar/toolbar_actions_bar_delegate.h',
- 'browser/ui/toolbar/toolbar_action_view_controller.h',
- 'browser/ui/toolbar/toolbar_action_view_delegate.h',
- 'browser/ui/toolbar/wrench_menu_badge_controller.cc',
- 'browser/ui/toolbar/wrench_menu_badge_controller.h',
'browser/ui/toolbar/wrench_icon_painter.cc',
'browser/ui/toolbar/wrench_icon_painter.h',
+ 'browser/ui/toolbar/wrench_menu_badge_controller.cc',
+ 'browser/ui/toolbar/wrench_menu_badge_controller.h',
'browser/ui/toolbar/wrench_menu_model.cc',
'browser/ui/toolbar/wrench_menu_model.h',
'browser/ui/uma_browsing_activity_observer.cc',
@@ -1592,6 +1601,8 @@
'browser/ui/webui/bookmarks_ui.h',
'browser/ui/webui/chrome_web_contents_handler.cc',
'browser/ui/webui/chrome_web_contents_handler.h',
+ 'browser/ui/webui/devtools_ui.cc',
+ 'browser/ui/webui/devtools_ui.h',
'browser/ui/webui/downloads_dom_handler.cc',
'browser/ui/webui/downloads_dom_handler.h',
'browser/ui/webui/downloads_ui.cc',
@@ -1805,19 +1816,6 @@
'browser/ui/window_sizer/window_sizer.cc',
'browser/ui/window_sizer/window_sizer.h',
],
- 'chrome_browser_ui_non_mobile_sources': [
- 'browser/ui/browser_commands.cc',
- 'browser/ui/browser_commands.h',
- 'browser/ui/browser_tab_restorer.cc',
- 'browser/ui/browser_window_state.cc',
- 'browser/ui/browser_window_state.h',
- 'browser/ui/scoped_tabbed_browser_displayer.cc',
- 'browser/ui/scoped_tabbed_browser_displayer.h',
- 'browser/ui/sync/sync_promo_ui.cc',
- 'browser/ui/sync/sync_promo_ui.h',
- 'browser/ui/webui/devtools_ui.cc',
- 'browser/ui/webui/devtools_ui.h',
- ],
'chrome_browser_ui_print_preview_sources': [
'browser/ui/webui/print_preview/print_preview_handler.cc',
'browser/ui/webui/print_preview/print_preview_handler.h',
@@ -2496,8 +2494,8 @@
'browser/ui/ash/session_state_delegate_views.cc',
'browser/ui/ash/session_state_delegate_views.h',
],
- # Used when not using android and not using Athena.
- 'chrome_browser_ui_non_athena_non_android_sources': [
+ # Used when not using mobile and not using Athena.
+ 'chrome_browser_ui_non_athena_non_mobile_sources': [
'browser/ui/extensions/application_launch_web_app.cc',
'browser/ui/extensions/extension_install_ui_factory.cc',
'browser/ui/webui/chromeos/keyboard_overlay_ui.cc',
@@ -2717,7 +2715,13 @@
],
},
}, { # OS == "ios"
- 'sources': [ '<@(chrome_browser_ui_ios_sources)' ],
+ 'sources': [
+ '<@(chrome_browser_ui_ios_sources)'
+ ],
+ 'sources!': [
+ 'browser/ui/external_protocol_dialog_delegate.cc',
+ 'browser/ui/startup/default_browser_prompt.cc',
+ ],
'dependencies': [
'../net/net.gyp:net',
],
@@ -2810,8 +2814,8 @@
],
}, { # use_athena==0
'conditions': [
- ['OS!="android"', {
- 'sources': [ '<@(chrome_browser_ui_non_athena_non_android_sources)' ],
+ ['OS!="android" and OS!="ios"', {
+ 'sources': [ '<@(chrome_browser_ui_non_athena_non_mobile_sources)' ],
}],
['use_ash==1', {
'sources': [ '<@(chrome_browser_ui_ash_non_athena_sources)' ],
@@ -2907,8 +2911,6 @@
'chrome_browser_ui_views.gyp:browser_ui_views',
],
'sources': [ '<@(chrome_browser_ui_android_sources)' ],
- }, { # Non-Android
- 'sources': [ '<@(chrome_browser_ui_non_android_sources)' ],
}],
['OS=="mac"', {
'sources': [ '<@(chrome_browser_ui_mac_sources)' ],
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698