Update page info for new search geolocation system.

chrome/browser/ui/android/page_info/website_settings_popup_android.cc

 // Copyright (c) 2013 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/ui/android/page_info/website_settings_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/stl_util.h"
+#include "chrome/browser/android/search_geolocation/search_geolocation_service.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/ui/website_settings/website_settings.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/security_state/core/security_state.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/WebsiteSettingsPopup_jni.h"
+#include "url/origin.h"
 
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 
 // static
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jclass>& clazz,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
 
   return reinterpret_cast<intptr_t>(
       new WebsiteSettingsPopupAndroid(env, obj, web_contents));
 }
 
 WebsiteSettingsPopupAndroid::WebsiteSettingsPopupAndroid(
     JNIEnv* env,
     jobject java_website_settings_pop,
-    content::WebContents* web_contents) {
+    content::WebContents* web_contents)
+    : search_geolocation_service_(nullptr) {
   // Important to use GetVisibleEntry to match what's showing in the omnibox.
   content::NavigationEntry* nav_entry =
       web_contents->GetController().GetVisibleEntry();
   if (nav_entry == NULL)
     return;
 
   url_ = nav_entry->GetURL();
 
   popup_jobject_.Reset(env, java_website_settings_pop);
 
   SecurityStateTabHelper* helper =
       SecurityStateTabHelper::FromWebContents(web_contents);
   DCHECK(helper);
   security_state::SecurityInfo security_info;
   helper->GetSecurityInfo(&security_info);
 
+  search_geolocation_service_ =
+      SearchGeolocationService::Factory::GetForBrowserContext(
+          web_contents->GetBrowserContext());
+
   presenter_.reset(new WebsiteSettings(
       this, Profile::FromBrowserContext(web_contents->GetBrowserContext()),
       TabSpecificContentSettings::FromWebContents(web_contents), web_contents,
       nav_entry->GetURL(), security_info));
 }
 
 WebsiteSettingsPopupAndroid::~WebsiteSettingsPopupAndroid() {}
 
 void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj) {
@@ skipping 39 matching lines @@
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_IMAGES);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_POPUPS);
   permissions_to_display.push_back(CONTENT_SETTINGS_TYPE_AUTOPLAY);
 
   std::map<ContentSettingsType, ContentSetting>
       user_specified_settings_to_display;
 
   for (const auto& permission : permission_info_list) {
-    if (base::ContainsValue(permissions_to_display, permission.type) &&
-        permission.setting != CONTENT_SETTING_DEFAULT) {
-      user_specified_settings_to_display[permission.type] = permission.setting;
+    if (base::ContainsValue(permissions_to_display, permission.type)) {
+      if (permission.setting != CONTENT_SETTING_DEFAULT) {
+        user_specified_settings_to_display[permission.type] =
+            permission.setting;
+      } else if (permission.type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
+        if (search_geolocation_service_ &&
+            search_geolocation_service_->UseDSEGeolocationSetting(
+                url::Origin(url_))) {
+          user_specified_settings_to_display[permission.type] =
+              search_geolocation_service_->GetDSEGeolocationSetting()
+                  ? CONTENT_SETTING_ALLOW
+                  : CONTENT_SETTING_BLOCK;
+        }
+      }
     }
   }
 
   for (const auto& permission : permissions_to_display) {
     if (base::ContainsKey(user_specified_settings_to_display, permission)) {
       base::string16 setting_title =
           WebsiteSettingsUI::PermissionTypeToUIString(permission);
 
       Java_WebsiteSettingsPopup_addPermissionSection(
           env, popup_jobject_, ConvertUTF16ToJavaString(env, setting_title),
@@ skipping 13 matching lines @@
   }
 
   Java_WebsiteSettingsPopup_updatePermissionDisplay(env, popup_jobject_);
 }
 
 // static
 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }