Chromium Code Reviews| Index: chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc |
| diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc |
| index 391643ecb216e836487042777be37a7f0decf607..df9f49209937767c6c23f81f630bd2d945e27971 100644 |
| --- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc |
| +++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc |
| @@ -4,15 +4,23 @@ |
| #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h" |
| +#include "base/strings/string_util.h" |
| #include "base/strings/utf_string_conversions.h" |
| +#include "chrome/common/extensions/permissions/permissions_data.h" |
| +#include "chrome/common/extensions/permissions/settings_override_permission.h" |
| #include "extensions/common/error_utils.h" |
| #include "extensions/common/manifest_constants.h" |
| +#include "extensions/common/permissions/api_permission_set.h" |
| +#include "extensions/common/permissions/permissions_info.h" |
| +#include "url/gurl.h" |
| using extensions::api::manifest_types::ChromeSettingsOverrides; |
| namespace extensions { |
| namespace { |
| +const char* kWwwPrefix = "www."; |
| + |
| scoped_ptr<GURL> CreateManifestURL(const std::string& url) { |
| scoped_ptr<GURL> manifest_url(new GURL(url)); |
| if (!manifest_url->is_valid() || |
| @@ -54,6 +62,12 @@ std::vector<GURL> ParseStartupPage(const ChromeSettingsOverrides& overrides, |
| return urls; |
| } |
| +std::string RemoveWwwPrefix(const std::string& url) { |
| + if (StartsWithASCII(url, kWwwPrefix, false)) |
| + return url.substr(strlen(kWwwPrefix)); |
| + return url; |
| +} |
| + |
| } // namespace |
| SettingsOverrides::SettingsOverrides() {} |
| @@ -86,6 +100,26 @@ bool SettingsOverridesHandler::Parse(Extension* extension, string16* error) { |
| *error = ASCIIToUTF16(manifest_errors::kInvalidEmptySettingsOverrides); |
| return false; |
| } |
| + APIPermissionSet* permission_set = |
| + PermissionsData::GetInitialAPIPermissions(extension); |
| + DCHECK(permission_set); |
| + if (info->search_engine) { |
| + permission_set->insert(new SettingsOverrideAPIPermission( |
| + PermissionsInfo::GetInstance()->GetByID(APIPermission::kSearchSettings), |
| + RemoveWwwPrefix(CreateManifestURL(info->search_engine->search_url)-> |
|
robertshield
2013/11/04 01:11:13
Please add a comment or a note in the changelist d
MAD
2013/11/04 02:06:34
Done.
|
| + GetOrigin().host()))); |
| + } |
| + if (!info->startup_pages.empty()) { |
| + permission_set->insert(new SettingsOverrideAPIPermission( |
| + PermissionsInfo::GetInstance()->GetByID(APIPermission::kStartupPages), |
| + // We only support one startup page. |
| + RemoveWwwPrefix(info->startup_pages[0].GetContent()))); |
| + } |
| + if (info->homepage) { |
| + permission_set->insert(new SettingsOverrideAPIPermission( |
| + PermissionsInfo::GetInstance()->GetByID(APIPermission::kHomePage), |
| + RemoveWwwPrefix(info->homepage.get()->GetContent()))); |
| + } |
| extension->SetManifestData(manifest_keys::kSettingsOverride, |
| info.release()); |
| return true; |