MD Site Settings: Add five new top level categories

chrome/browser/ui/webui/settings/site_settings_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 118 matching lines @@
       = new StorageInfoFetcher(profile_);
   storage_info_fetcher->FetchStorageInfo(
       base::Bind(&SiteSettingsHandler::OnGetUsageInfo, base::Unretained(this)));
 }
 
 void SiteSettingsHandler::HandleClearUsage(
     const base::ListValue* args) {
   CHECK_EQ(2U, args->GetSize());
   std::string origin;
   CHECK(args->GetString(0, &origin));
-  double type;
-  CHECK(args->GetDouble(1, &type));
+  std::string type;
+  CHECK(args->GetString(1, &type));
 
   GURL url(origin);
+  LOG(ERROR) << url.spec().c_str() << " " << type;
   if (url.is_valid()) {
+    LOG(ERROR) << "Clearing!";
     clearing_origin_ = origin;
 
     // Start by clearing the storage data asynchronously.
     scoped_refptr<StorageInfoFetcher> storage_info_fetcher
         = new StorageInfoFetcher(profile_);
     storage_info_fetcher->ClearStorage(
         url.host(),
-        static_cast<storage::StorageType>(static_cast<int>(type)),
+        static_cast<storage::StorageType>(static_cast<int>(
+            site_settings::ContentSettingsTypeFromGroupName(type))),
         base::Bind(&SiteSettingsHandler::OnUsageInfoCleared,
             base::Unretained(this)));
 
     // Also clear the *local* storage data.
     scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper =
         new BrowsingDataLocalStorageHelper(profile_);
     local_storage_helper->DeleteOrigin(url);
   }
 }
 
 void SiteSettingsHandler::HandleSetDefaultValueForContentType(
     const base::ListValue* args) {
   CHECK_EQ(2U, args->GetSize());
-  double content_type;
-  CHECK(args->GetDouble(0, &content_type));
+  std::string content_type;
+  CHECK(args->GetString(0, &content_type));
   std::string setting;
   CHECK(args->GetString(1, &setting));
   ContentSetting default_setting;
   CHECK(content_settings::ContentSettingFromString(setting, &default_setting));
 
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   map->SetDefaultContentSetting(
-      static_cast<ContentSettingsType>(static_cast<int>(content_type)),
+      static_cast<ContentSettingsType>(static_cast<int>(
+          site_settings::ContentSettingsTypeFromGroupName(content_type))),
       default_setting);
 }
 
 void SiteSettingsHandler::HandleGetDefaultValueForContentType(
     const base::ListValue* args) {
   AllowJavascript();
 
   CHECK_EQ(2U, args->GetSize());
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
-  double type;
-  CHECK(args->GetDouble(1, &type));
+  std::string type;
+  CHECK(args->GetString(1, &type));
 
   ContentSettingsType content_type =
-      static_cast<ContentSettingsType>(static_cast<int>(type));
+      static_cast<ContentSettingsType>(static_cast<int>(
+          site_settings::ContentSettingsTypeFromGroupName(type)));
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   ContentSetting setting = map->GetDefaultContentSetting(content_type, nullptr);
 
   // FullScreen is Allow vs. Ask.
   bool enabled;
   if (content_type == CONTENT_SETTINGS_TYPE_FULLSCREEN)
       enabled = setting != CONTENT_SETTING_ASK;
   else
       enabled = setting != CONTENT_SETTING_BLOCK;
 
   ResolveJavascriptCallback(*callback_id, base::FundamentalValue(enabled));
 }
 
 void SiteSettingsHandler::HandleGetExceptionList(const base::ListValue* args) {
   AllowJavascript();
 
   CHECK_EQ(2U, args->GetSize());
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
-  double type;
-  CHECK(args->GetDouble(1, &type));
+  std::string type;
+  CHECK(args->GetString(1, &type));
   ContentSettingsType content_type =
-      static_cast<ContentSettingsType>(static_cast<int>(type));
+      static_cast<ContentSettingsType>(static_cast<int>(
+          site_settings::ContentSettingsTypeFromGroupName(type)));
 
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   std::unique_ptr<base::ListValue> exceptions(new base::ListValue);
   site_settings::GetExceptionsFromHostContentSettingsMap(
       map, content_type, web_ui(), exceptions.get());
   ResolveJavascriptCallback(*callback_id, *exceptions.get());
 }
 
 void SiteSettingsHandler::HandleResetCategoryPermissionForOrigin(
     const base::ListValue* args) {
   CHECK_EQ(3U, args->GetSize());
   std::string primary_pattern;
   CHECK(args->GetString(0, &primary_pattern));
   std::string secondary_pattern;
   CHECK(args->GetString(1, &secondary_pattern));
-  double type;
-  CHECK(args->GetDouble(2, &type));
+  std::string type;
+  CHECK(args->GetString(2, &type));
 
   ContentSettingsType content_type =
-      static_cast<ContentSettingsType>(static_cast<int>(type));
+      static_cast<ContentSettingsType>(static_cast<int>(
+          site_settings::ContentSettingsTypeFromGroupName(type)));
 
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   map->SetContentSettingCustomScope(
       ContentSettingsPattern::FromString(primary_pattern),
       secondary_pattern.empty() ?
           ContentSettingsPattern::Wildcard() :
           ContentSettingsPattern::FromString(secondary_pattern),
       content_type, "", CONTENT_SETTING_DEFAULT);
 }
 
 void SiteSettingsHandler::HandleSetCategoryPermissionForOrigin(
     const base::ListValue* args) {
   CHECK_EQ(4U, args->GetSize());
   std::string primary_pattern;
   CHECK(args->GetString(0, &primary_pattern));
   std::string secondary_pattern;
   CHECK(args->GetString(1, &secondary_pattern));
-  double type;
-  CHECK(args->GetDouble(2, &type));
+  std::string type;
+  CHECK(args->GetString(2, &type));
   std::string value;
   CHECK(args->GetString(3, &value));
 
   ContentSettingsType content_type =
-      static_cast<ContentSettingsType>(static_cast<int>(type));
+      static_cast<ContentSettingsType>(static_cast<int>(
+          site_settings::ContentSettingsTypeFromGroupName(type)));
   ContentSetting setting;
   CHECK(content_settings::ContentSettingFromString(value, &setting));
 
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
   map->SetContentSettingCustomScope(
       ContentSettingsPattern::FromString(primary_pattern),
       secondary_pattern.empty() ?
           ContentSettingsPattern::Wildcard() :
           ContentSettingsPattern::FromString(secondary_pattern),
       content_type, "", setting);
 }
 
 void SiteSettingsHandler::HandleIsPatternValid(
     const base::ListValue* args) {
   CHECK_EQ(2U, args->GetSize());
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
   std::string pattern_string;
   CHECK(args->GetString(1, &pattern_string));
 
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString(pattern_string);
   ResolveJavascriptCallback(
       *callback_id, base::FundamentalValue(pattern.IsValid()));
 }
 
 }  // namespace settings