[Android] Upstream remaining changes to NTP UI code.

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 2313 matching lines @@
             'browser/component/components.gyp:web_contents_delegate_android',
             'chrome_browser_jni_headers',
           ],
           'sources': [
             'browser/ui/find_bar/find_match_rects_details.cc',
             'browser/ui/find_bar/find_match_rects_details.h',
             'browser/ui/webui/ntp/android/bookmarks_handler.cc',
             'browser/ui/webui/ntp/android/bookmarks_handler.h',
             'browser/ui/webui/ntp/android/context_menu_handler.cc',
             'browser/ui/webui/ntp/android/context_menu_handler.h',
+            'browser/ui/webui/ntp/android/new_tab_page_ready_handler.cc',
+            'browser/ui/webui/ntp/android/new_tab_page_ready_handler.h',
             'browser/ui/webui/ntp/android/partner_bookmarks_shim.cc',
             'browser/ui/webui/ntp/android/partner_bookmarks_shim.h',
             'browser/ui/webui/ntp/android/promo_handler.cc',
             'browser/ui/webui/ntp/android/promo_handler.h',
           ],
           'sources!': [
             # Android uses native UI for sync setup.
             'browser/ui/webui/ntp/new_tab_page_sync_handler.cc',
             'browser/ui/webui/ntp/new_tab_page_sync_handler.h',
             'browser/ui/webui/ntp/new_tab_sync_setup_handler.cc',
             'browser/ui/webui/ntp/new_tab_sync_setup_handler.h',
             'browser/ui/webui/ntp/ntp_login_handler.cc',
             'browser/ui/webui/ntp/ntp_login_handler.h',
-            '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/sync_setup_handler.cc',
             'browser/ui/webui/sync_setup_handler.h',
 
             # There's no Browser/BrowserList on Android.
             'browser/ui/bookmarks/bookmark_context_menu_controller.cc',
             'browser/ui/browser.cc',
             'browser/ui/browser_command_controller.cc',
             'browser/ui/browser_finder.cc',
             'browser/ui/browser_instant_controller.cc',
             'browser/ui/browser_list.cc',
@@ skipping 12 matching lines @@
             '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/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/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'],
           ]}
         ],
       ],
     },
   ],
 }