Update the Google Search geolocation disclosure to make it more obvious.

chrome/browser/android/tab_android.cc

 // 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.
 
 #include "chrome/browser/android/tab_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
 #include "blimp/client/public/blimp_client_context.h"
 #include "blimp/client/public/contents/blimp_contents.h"
 #include "blimp/client/public/contents/blimp_contents_view.h"
 #include "blimp/client/public/contents/blimp_navigation_controller.h"
 #include "cc/layers/layer.h"
 #include "chrome/browser/android/blimp/blimp_client_context_factory.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
 #include "chrome/browser/android/metrics/uma_utils.h"
 #include "chrome/browser/android/offline_pages/offline_page_bridge.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/android/offline_pages/offline_page_utils.h"
+#include "chrome/browser/android/search_geolocation_disclosure_infobar_delegate.h"
 #include "chrome/browser/android/tab_web_contents_delegate_android.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
+#include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.h"
 #include "chrome/browser/ui/android/context_menu_helper.h"
 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_helpers.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/search/instant_types.h"
 #include "chrome/common/url_constants.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/navigation_interception/navigation_params.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
+#include "components/search_engines/template_url.h"
+#include "components/search_engines/template_url_service.h"
 #include "components/sessions/content/content_live_tab.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/browser_controls_state.h"
 #include "content/public/common/resource_request_body.h"
 #include "jni/Tab_jni.h"
 #include "net/base/escape.h"
 #include "skia/ext/image_operations.h"
@@ skipping 541 matching lines @@
         search_tab_helper->SupportsInstant()) {
       EmbeddedSearchRequestParams request_params(gurl);
       search_tab_helper->Submit(search_terms, request_params);
       return DEFAULT_PAGE_LOAD;
     }
     load_params.is_renderer_initiated = is_renderer_initiated;
     load_params.should_replace_current_entry = should_replace_current_entry;
     load_params.intent_received_timestamp = intent_received_timestamp;
     load_params.has_user_gesture = has_user_gesture;
     web_contents()->GetController().LoadURLWithParams(load_params);
+
+    MaybeShowDefaultSearchGeolocationDisclosure(gurl);

[gone, 2016/11/04 23:21:48]

Is it possible to add this to a WebContentsObserver instead?  I'd like to avoid
adding more stuff to Tab/TabAndroid—especially since the function you're adding
doesn't seem to care too much about the Tab itself (just the Window and the
WebContents, AFAICT).

[benwells, 2016/11/07 08:36:06]

Done.

   }
   return DEFAULT_PAGE_LOAD;
 }
 
 void TabAndroid::SetActiveNavigationEntryTitleForUrl(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& jurl,
     const JavaParamRef<jstring>& jtitle) {
   DCHECK(web_contents());
@@ skipping 232 matching lines @@
 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 // static
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
+
+void TabAndroid::MaybeShowDefaultSearchGeolocationDisclosure(GURL gurl) {
+  if (base::FeatureList::IsEnabled(features::kConsistentOmniboxGeolocation)) {
+    TemplateURLService* template_url_service =
+        TemplateURLServiceFactory::GetForProfile(GetProfile());
+    // Only show the disclosure for default search navigations from the omnibox.
+    bool is_search_url =
+        template_url_service->IsSearchResultsPageFromDefaultSearchProvider(
+            gurl);
+    if (!is_search_url)
+      return;
+
+    // Only show the disclosure if Google is the default search engine.
+    TemplateURL* default_search =
+        template_url_service->GetDefaultSearchProvider();
+    if (!default_search ||
+        !default_search->url_ref().HasGoogleBaseURLs(
+            template_url_service->search_terms_data())) {
+      return;
+    }
+
+    // Perform Java side checks for whether the disclosure should be shown.
+    JNIEnv* env = base::android::AttachCurrentThread();
+    if (!Java_Tab_couldShowDefaultSearchGeolocationDisclosure(
+            env, weak_java_tab_.get(env))) {
+      return;
+    }
+
+    // Only show the disclosure if the geolocation permission is set to ASK
+    // (i.e. has not been explicitly set or revoked).
+    blink::mojom::PermissionStatus status =
+        PermissionManager::Get(GetProfile())
+            ->GetPermissionStatus(content::PermissionType::GEOLOCATION, gurl,
+                                  gurl);
+    if (status != blink::mojom::PermissionStatus::ASK)
+      return;
+
+    // All good, let's show the disclosure.
+    SearchGeolocationDisclosureInfoBarDelegate::Create(web_contents());
+  }
+}