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

chrome/browser/android/search_geolocation/search_geolocation_disclosure_tab_helper.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_ANDROID_SEARCH_GEOLOCATION_SEARCH_GEOLOCATION_DISCLOSURE_TAB_HELPER_H_
 #define CHROME_BROWSER_ANDROID_SEARCH_GEOLOCATION_SEARCH_GEOLOCATION_DISCLOSURE_TAB_HELPER_H_
 
 #include <jni.h>
 
 #include "base/macros.h"
@@ skipping 12 matching lines @@
     : public content::WebContentsObserver,
       public content::WebContentsUserData<
           SearchGeolocationDisclosureTabHelper> {
  public:
   ~SearchGeolocationDisclosureTabHelper() override;
 
   // content::WebContentsObserver overrides.
   void NavigationEntryCommitted(
       const content::LoadCommittedDetails& load_details) override;
 
-  void MaybeShowDisclosure(const GURL& gurl);
+  void MaybeShowDisclosureForAPIAccess(const GURL& gurl);
 
   static void ResetDisclosure(Profile* profile);
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   // Registers native methods.
   static bool Register(JNIEnv* env);
 
  private:
   explicit SearchGeolocationDisclosureTabHelper(content::WebContents* contents);
   friend class content::WebContentsUserData<
       SearchGeolocationDisclosureTabHelper>;
 
-  bool ShouldShowDisclosureForUrl(const GURL& gurl);
+  void MaybeShowDisclosureForNavigation(const GURL& gurl);
+  void MaybeShowDisclosureForValidUrl(const GURL& gurl);
+
+  // Determines if the disclosure should be shown for the URL when a navigation
+  // to the URL occurs. This is the case whenever the URL is a result of an
+  // omnibox search, as it will result in X-Geo headers being sent.
+  bool ShouldShowDisclosureForNavigation(const GURL& gurl);
+
+  // Determine if the disclosure should be shown for the URL when a page on the
+  // URL uses the geolocation API. This is the case if the url's access to the
+  // geolocation API is allowed due to the geolocation DSE setting.
+  bool ShouldShowDisclosureForAPIAccess(const GURL& gurl);
 
   // Record metrics, once per client, of the permission state before and after
   // the disclosure has been shown.
   void RecordPreDisclosureMetrics(const GURL& gurl);
   void RecordPostDisclosureMetrics(const GURL& gurl);
   Profile* GetProfile();
 
   bool consistent_geolocation_disclosure_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchGeolocationDisclosureTabHelper);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_SEARCH_GEOLOCATION_SEARCH_GEOLOCATION_DISCLOSURE_TAB_HELPER_H_