Refactor ShortcutHelper and merge in BookmarkUtils

chrome/chrome_browser.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': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 205 matching lines @@
       'browser/android/rappor/rappor_service_bridge.h',
       'browser/android/recently_closed_tabs_bridge.cc',
       'browser/android/recently_closed_tabs_bridge.h',
       'browser/android/resource_id.h',
       'browser/android/resource_mapper.cc',
       'browser/android/resource_mapper.h',
       'browser/android/rlz/revenue_stats.cc',
       'browser/android/rlz/revenue_stats.h',
       'browser/android/seccomp_support_detector.cc',
       'browser/android/seccomp_support_detector.h',
-      'browser/android/shortcut_data_fetcher.cc',
-      'browser/android/shortcut_data_fetcher.h',
       'browser/android/shortcut_helper.cc',
       'browser/android/shortcut_helper.h',
       'browser/android/shortcut_info.cc',
       'browser/android/shortcut_info.h',
       'browser/android/signin/account_management_screen_helper.cc',
       'browser/android/signin/account_management_screen_helper.h',
       'browser/android/signin/signin_manager_android.cc',
       'browser/android/signin/signin_manager_android.h',
       'browser/android/tab/thumbnail_tab_helper_android.cc',
       'browser/android/tab/thumbnail_tab_helper_android.h',
       'browser/android/tab_android.cc',
       'browser/android/tab_android.h',
       'browser/android/tab_state.cc',
       'browser/android/tab_state.h',
       'browser/android/thumbnail/thumbnail.cc',
       'browser/android/thumbnail/thumbnail.h',
       'browser/android/thumbnail/thumbnail_cache.cc',
       'browser/android/thumbnail/thumbnail_cache.h',
       'browser/android/url_utilities.cc',
       'browser/android/url_utilities.h',
       'browser/android/voice_search_tab_helper.cc',
       'browser/android/voice_search_tab_helper.h',
       'browser/android/warmup_manager.cc',
       'browser/android/warmup_manager.h',
       'browser/android/web_contents_factory.cc',
       'browser/android/web_contents_factory.h',
+      'browser/android/webapps/add_to_homescreen_data_fetcher.cc',
+      'browser/android/webapps/add_to_homescreen_data_fetcher.h',
+      'browser/android/webapps/add_to_homescreen_dialog_helper.cc',
+      'browser/android/webapps/add_to_homescreen_dialog_helper.h',
       'browser/android/webapps/single_tab_mode_tab_helper.cc',
       'browser/android/webapps/single_tab_mode_tab_helper.h',
       'browser/app_controller_mac.h',
       'browser/app_controller_mac.mm',
       'browser/app_icon_win.cc',
       'browser/app_icon_win.h',
       'browser/app_mode/app_mode_utils.cc',
       'browser/app_mode/app_mode_utils.h',
       'browser/autofill/android/personal_data_manager_android.cc',
       'browser/autofill/android/personal_data_manager_android.h',
@@ skipping 1531 matching lines @@
       'android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java',
       'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java',
       'android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java',
       'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java',
       'android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java',
       'android/java/src/org/chromium/chrome/browser/ssl/ConnectionSecurity.java',
       'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java',
+      'android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogHelper.java',
     ],
     'chrome_browser_mdns_sources': [
       'browser/local_discovery/privet_traffic_detector.cc',
       'browser/local_discovery/privet_traffic_detector.h',
       'browser/local_discovery/service_discovery_client_mdns.cc',
       'browser/local_discovery/service_discovery_client_mdns.h',
       'browser/local_discovery/service_discovery_client_utility.cc',
       'browser/local_discovery/service_discovery_client_utility.h',
       'browser/local_discovery/service_discovery_host_client.cc',
       'browser/local_discovery/service_discovery_host_client.h',
@@ skipping 2278 matching lines @@
             '../components/components.gyp:omnibox_browser',
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
           ],
         },
       ],
     }],
   ],
 }