Android: Remove a few more unneeded files from the build.

chrome/chrome_browser_ui.gypi

 # Copyright 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.
 
 {
   'variables': {
     'chrome_browser_ui_non_ios_sources': [
       'browser/ui/accelerator_utils.h',
       'browser/ui/android/android_about_app_info.cc',
       'browser/ui/android/android_about_app_info.h',
@@ skipping 118 matching lines @@
       'browser/ui/browser_mac.cc',
       'browser/ui/browser_mac.h',
       'browser/ui/browser_navigator.cc',
       'browser/ui/browser_navigator.h',
       'browser/ui/browser_otr_state_android.cc',
       'browser/ui/browser_tab_restorer.cc',
       'browser/ui/browser_ui_prefs.cc',
       'browser/ui/browser_ui_prefs.h',
       'browser/ui/browser_win.cc',
       'browser/ui/browser_window.h',
-      'browser/ui/browser_window_state.cc',
-      'browser/ui/browser_window_state.h',
       'browser/ui/browser_window_testing_views.h',
       'browser/ui/chrome_select_file_policy.cc',
       'browser/ui/chrome_select_file_policy.h',
       'browser/ui/cocoa/accelerator_utils_cocoa.mm',
       'browser/ui/cocoa/about_ipc_controller.h',
       'browser/ui/cocoa/about_ipc_controller.mm',
       'browser/ui/cocoa/about_ipc_dialog.h',
       'browser/ui/cocoa/about_ipc_dialog.mm',
       'browser/ui/cocoa/accelerators_cocoa.h',
       'browser/ui/cocoa/accelerators_cocoa.mm',
@@ skipping 659 matching lines @@
       'browser/ui/passwords/password_ui_view.h',
       'browser/ui/passwords/save_password_refusal_combobox_model.cc',
       'browser/ui/passwords/save_password_refusal_combobox_model.h',
       'browser/ui/prefs/prefs_tab_helper.cc',
       'browser/ui/prefs/prefs_tab_helper.h',
       'browser/ui/process_singleton_dialog_linux.h',
       'browser/ui/profile_chooser_constants.h',
       'browser/ui/profile_error_dialog.cc',
       'browser/ui/profile_error_dialog.h',
       'browser/ui/protocol_dialog_delegate.h',
-      'browser/ui/scoped_tabbed_browser_displayer.cc',
-      'browser/ui/scoped_tabbed_browser_displayer.h',
       'browser/ui/screen_capture_notification_ui.h',
       'browser/ui/search/instant_controller.cc',
       'browser/ui/search/instant_controller.h',
       'browser/ui/search/instant_page.cc',
       'browser/ui/search/instant_page.h',
       'browser/ui/search/instant_search_prerenderer.cc',
       'browser/ui/search/instant_search_prerenderer.h',
       'browser/ui/search/instant_tab.cc',
       'browser/ui/search/instant_tab.h',
       'browser/ui/search/search_ipc_router.cc',
@@ skipping 958 matching lines @@
       'browser/ui/webui/theme_handler.cc',
       'browser/ui/webui/theme_handler.h',
       'browser/ui/webui/uber/uber_ui.cc',
       'browser/ui/webui/uber/uber_ui.h',
       'browser/ui/window_sizer/window_sizer.cc',
       'browser/ui/window_sizer/window_sizer.h',
       'browser/ui/zoom/zoom_controller.cc',
       'browser/ui/zoom/zoom_controller.h',
     ],
     'chrome_browser_ui_non_mobile_sources': [
+      'browser/ui/browser_tab_restorer.cc',
+      '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',
       'browser/ui/webui/print_preview/print_preview_ui.cc',
       'browser/ui/webui/print_preview/print_preview_ui.h',
@@ skipping 414 matching lines @@
       'browser/ui/views/website_settings/website_settings_popup_view.h',
     ],
     # Cross-platform views sources also ready for toolkit-views on Mac.
     'chrome_browser_ui_views_sources': [
       'browser/ui/app_list/app_list_controller_delegate_views.cc',
       'browser/ui/app_list/app_list_controller_delegate_views.h',
       'browser/ui/app_list/app_list_service_views.cc',
       'browser/ui/app_list/app_list_service_views.h',
       'browser/ui/app_list/app_list_shower_views.cc',
       'browser/ui/app_list/app_list_shower_views.h',
+      'browser/ui/browser_window_state.cc',

[Lei Zhang, 2014/10/31 09:30:49]

Please help me figure out if this belongs here or in the
chrome_browser_ui_views_non_mac_sources section above.

[Andre, 2014/10/31 17:11:45]

Neither I think.
These 2 are for browser/ui/views which the Mac Cocoa build does not include.
How about chrome_browser_ui_non_mobile_sources?

[Lei Zhang, 2014/10/31 19:46:00]

In chrome_browser_ui_non_mobile_sources it goes.

+      'browser/ui/browser_window_state.h',
       'browser/ui/views/accessibility/accessibility_event_router_views.cc',
       'browser/ui/views/accessibility/accessibility_event_router_views.h',
       'browser/ui/views/chrome_browser_main_extra_parts_views.cc',
       'browser/ui/views/chrome_browser_main_extra_parts_views.h',
       'browser/ui/views/chrome_views_delegate.cc',
       'browser/ui/views/chrome_views_delegate.h',
       'browser/ui/views/find_bar_host.cc',
       'browser/ui/views/find_bar_host.h',
       'browser/ui/views/find_bar_view.cc',
       'browser/ui/views/find_bar_view.h',
@@ skipping 800 matching lines @@
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
           ],
           'sources': [ '<@(chrome_browser_ui_non_mobile_sources)' ],
         }],
       ],
     },
   ],
 }