Only show search geolocation disclosure on omnibox searches or API use.

chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.h

Index: chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.h
diff --git a/chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.h b/chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.h
index 2215c4016e8a2ed5532d8bf775a066fef5e1a87a..3b8924938f0b2ca2ba08f79f28765876d23c1087 100644
--- a/chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.h
+++ b/chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.h
@@ -30,7 +30,7 @@ class SearchGeolocationDisclosureTabHelper
   void NavigationEntryCommitted(
       const content::LoadCommittedDetails& load_details) override;
 
-  void MaybeShowDisclosure(const GURL& gurl);
+  void MaybeShowDisclosureForAPIAccess(const GURL& gurl);
 
   static void ResetDisclosure(Profile* profile);
 
@@ -44,7 +44,10 @@ class SearchGeolocationDisclosureTabHelper
   friend class content::WebContentsUserData<
       SearchGeolocationDisclosureTabHelper>;
 
-  bool ShouldShowDisclosureForUrl(const GURL& gurl);
+  void MaybeShowDisclosureForNavigation(const GURL& gurl);
+  void MaybeShowDisclosureForValidUrl(const GURL& gurl);
+  bool ShouldShowDisclosureForNavigation(const GURL& gurl);
+  bool ShouldShowDisclosureForAPIAccess(const GURL& gurl);

[raymes, 2017/05/17 23:56:07]

nit: could you add some comments describing the 2 different cases a little bit
more? 

[benwells, 2017/05/18 04:50:05]

Done.

 
   // Record metrics, once per client, of the permission state before and after
   // the disclosure has been shown.