Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" | 5 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| 11 | 11 |
| 12 #include "base/bind.h" | 12 #include "base/bind.h" |
| 13 #include "base/i18n/number_formatting.h" | 13 #include "base/i18n/number_formatting.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/values.h" | 15 #include "base/values.h" |
| 16 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" | 16 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" |
| 17 #include "chrome/browser/chrome_notification_types.h" | 17 #include "chrome/browser/chrome_notification_types.h" |
| 18 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 18 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
| 19 #include "chrome/browser/content_settings/web_site_settings_uma_util.h" | 19 #include "chrome/browser/content_settings/web_site_settings_uma_util.h" |
| 20 #include "chrome/browser/permissions/chooser_context_base.h" | 20 #include "chrome/browser/permissions/chooser_context_base.h" |
| 21 #include "chrome/browser/permissions/permission_manager.h" | |
| 22 #include "chrome/browser/permissions/permission_result.h" | |
| 21 #include "chrome/browser/permissions/permission_uma_util.h" | 23 #include "chrome/browser/permissions/permission_uma_util.h" |
| 22 #include "chrome/browser/permissions/permission_util.h" | 24 #include "chrome/browser/permissions/permission_util.h" |
| 23 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
| 24 #include "chrome/browser/ui/webui/site_settings_helper.h" | 26 #include "chrome/browser/ui/webui/site_settings_helper.h" |
| 25 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" | 27 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" |
| 26 #include "chrome/grit/generated_resources.h" | 28 #include "chrome/grit/generated_resources.h" |
| 29 #include "components/content_settings/core/browser/content_settings_utils.h" | |
| 27 #include "components/content_settings/core/browser/host_content_settings_map.h" | 30 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 28 #include "components/content_settings/core/common/content_settings_types.h" | 31 #include "components/content_settings/core/common/content_settings_types.h" |
| 29 #include "components/crx_file/id_util.h" | 32 #include "components/crx_file/id_util.h" |
| 30 #include "content/public/browser/browser_thread.h" | 33 #include "content/public/browser/browser_thread.h" |
| 31 #include "content/public/browser/notification_service.h" | 34 #include "content/public/browser/notification_service.h" |
| 32 #include "content/public/browser/web_ui.h" | 35 #include "content/public/browser/web_ui.h" |
| 33 #include "content/public/common/page_zoom.h" | 36 #include "content/public/common/page_zoom.h" |
| 34 #include "content/public/common/url_constants.h" | 37 #include "content/public/common/url_constants.h" |
| 35 #include "extensions/browser/extension_registry.h" | 38 #include "extensions/browser/extension_registry.h" |
| 36 #include "extensions/common/permissions/api_permission.h" | 39 #include "extensions/common/permissions/api_permission.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 GURL launch_url = | 95 GURL launch_url = |
| 93 extensions::AppLaunchInfo::GetLaunchWebURL(extension->get()); | 96 extensions::AppLaunchInfo::GetLaunchWebURL(extension->get()); |
| 94 // Skip adding the launch URL if it is part of the web extent. | 97 // Skip adding the launch URL if it is part of the web extent. |
| 95 if (web_extent.MatchesURL(launch_url)) | 98 if (web_extent.MatchesURL(launch_url)) |
| 96 continue; | 99 continue; |
| 97 site_settings::AddExceptionForHostedApp( | 100 site_settings::AddExceptionForHostedApp( |
| 98 launch_url.spec(), *extension->get(), exceptions); | 101 launch_url.spec(), *extension->get(), exceptions); |
| 99 } | 102 } |
| 100 } | 103 } |
| 101 | 104 |
| 105 // Retrieves the corresponding string, according to the following precedence | |
| 106 // order from highest to lowest priority: | |
| 107 // 1. Kill-switch. | |
| 108 // 2. Enterprise policy. | |
| 109 // 3. Extensions. | |
| 110 // 4. User-set per-origin setting. | |
| 111 // 5. Embargo. | |
| 112 // 6. User-set patterns. | |
| 113 // 7. User-set global default for a ContentSettingsType. | |
| 114 // 8. Chrome's built-in default. | |
| 115 std::string ConvertContentSettingSourceToString( | |
| 116 content_settings::SettingSource content_settings_source, | |
| 117 PermissionStatusSource permission_status_source) { | |
| 118 // TODO(patricialor): Do some plumbing for sources #1, #2, #3, and #5 through | |
| 119 // to the Web UI. Currently there aren't strings to represent these sources. | |
| 120 if (permission_status_source == PermissionStatusSource::KILL_SWITCH) | |
| 121 return site_settings::kPreferencesSource; // Source #1. | |
| 122 | |
| 123 if (content_settings_source == content_settings::SETTING_SOURCE_POLICY || | |
| 124 content_settings_source == content_settings::SETTING_SOURCE_SUPERVISED) { | |
| 125 return site_settings::kPolicyProviderId; // Source #2. | |
| 126 } | |
| 127 | |
| 128 if (content_settings_source == content_settings::SETTING_SOURCE_EXTENSION) | |
| 129 return site_settings::kExtensionProviderId; // Source #3. | |
| 130 | |
| 131 DCHECK_NE(content_settings::SETTING_SOURCE_NONE, content_settings_source); | |
| 132 if (content_settings_source == content_settings::SETTING_SOURCE_USER) { | |
| 133 if (permission_status_source == | |
| 134 PermissionStatusSource::SAFE_BROWSING_BLACKLIST || | |
| 135 permission_status_source == | |
| 136 PermissionStatusSource::MULTIPLE_DISMISSALS || | |
| 137 permission_status_source == PermissionStatusSource::MULTIPLE_IGNORES) { | |
| 138 return site_settings::kPreferencesSource; // Source #5. | |
| 139 } | |
| 140 // Source #4, #6, #7, #8. When #4 is the source, |permission_status_source| | |
| 141 // won't be set to any of the source #5 enum values, as PermissionManager is | |
| 142 // aware of the difference between these two sources internally. The | |
| 143 // subtlety here should go away when PermissionManager can handle all | |
| 144 // content settings and all possible sources. | |
| 145 return site_settings::kPreferencesSource; | |
| 146 } | |
| 147 | |
| 148 NOTREACHED(); | |
| 149 return site_settings::kPreferencesSource; | |
| 150 } | |
| 151 | |
| 152 ContentSetting GetContentSettingForOrigin(const GURL& origin, | |
| 153 ContentSettingsType content_type, | |
| 154 Profile* profile, | |
| 155 std::string* source_string) { | |
| 156 // TODO(patricialor): In future, PermissionManager should know about all | |
| 157 // content settings, not just the permissions, plus all the possible sources, | |
| 158 // and the calls to HostContentSettingsMap should be removed. | |
| 159 content_settings::SettingInfo info; | |
| 160 HostContentSettingsMap* map = | |
| 161 HostContentSettingsMapFactory::GetForProfile(profile); | |
| 162 std::unique_ptr<base::Value> value = map->GetWebsiteSetting( | |
| 163 origin, origin, content_type, std::string(), &info); | |
| 164 | |
| 165 // Retrieve the content setting. | |
| 166 PermissionResult result(CONTENT_SETTING_DEFAULT, | |
| 167 PermissionStatusSource::UNSPECIFIED); | |
| 168 if (PermissionUtil::IsPermission(content_type)) { | |
| 169 result = PermissionManager::Get(profile)->GetPermissionStatus( | |
| 170 content_type, origin, origin); | |
| 171 } else { | |
| 172 DCHECK(value.get()); | |
| 173 DCHECK_EQ(base::Value::Type::INTEGER, value->GetType()); | |
| 174 result.content_setting = | |
| 175 content_settings::ValueToContentSetting(value.get()); | |
| 176 } | |
| 177 | |
| 178 // Retrieve the source of the content setting. | |
| 179 *source_string = | |
| 180 ConvertContentSettingSourceToString(info.source, result.source); | |
| 181 return result.content_setting; | |
| 182 } | |
| 183 | |
| 102 } // namespace | 184 } // namespace |
| 103 | 185 |
| 104 | 186 |
| 105 SiteSettingsHandler::SiteSettingsHandler(Profile* profile) | 187 SiteSettingsHandler::SiteSettingsHandler(Profile* profile) |
| 106 : profile_(profile), observer_(this) { | 188 : profile_(profile), observer_(this) { |
| 107 } | 189 } |
| 108 | 190 |
| 109 SiteSettingsHandler::~SiteSettingsHandler() { | 191 SiteSettingsHandler::~SiteSettingsHandler() { |
| 110 } | 192 } |
| 111 | 193 |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 132 base::Unretained(this))); | 214 base::Unretained(this))); |
| 133 web_ui()->RegisterMessageCallback( | 215 web_ui()->RegisterMessageCallback( |
| 134 "getDefaultValueForContentType", | 216 "getDefaultValueForContentType", |
| 135 base::Bind(&SiteSettingsHandler::HandleGetDefaultValueForContentType, | 217 base::Bind(&SiteSettingsHandler::HandleGetDefaultValueForContentType, |
| 136 base::Unretained(this))); | 218 base::Unretained(this))); |
| 137 web_ui()->RegisterMessageCallback( | 219 web_ui()->RegisterMessageCallback( |
| 138 "getExceptionList", | 220 "getExceptionList", |
| 139 base::Bind(&SiteSettingsHandler::HandleGetExceptionList, | 221 base::Bind(&SiteSettingsHandler::HandleGetExceptionList, |
| 140 base::Unretained(this))); | 222 base::Unretained(this))); |
| 141 web_ui()->RegisterMessageCallback( | 223 web_ui()->RegisterMessageCallback( |
| 224 "getOriginPermissions", | |
| 225 base::Bind(&SiteSettingsHandler::HandleGetOriginPermissions, | |
| 226 base::Unretained(this))); | |
| 227 web_ui()->RegisterMessageCallback( | |
| 142 "resetCategoryPermissionForOrigin", | 228 "resetCategoryPermissionForOrigin", |
| 143 base::Bind(&SiteSettingsHandler::HandleResetCategoryPermissionForOrigin, | 229 base::Bind(&SiteSettingsHandler::HandleResetCategoryPermissionForOrigin, |
| 144 base::Unretained(this))); | 230 base::Unretained(this))); |
| 145 web_ui()->RegisterMessageCallback( | 231 web_ui()->RegisterMessageCallback( |
| 146 "setCategoryPermissionForOrigin", | 232 "setCategoryPermissionForOrigin", |
| 147 base::Bind(&SiteSettingsHandler::HandleSetCategoryPermissionForOrigin, | 233 base::Bind(&SiteSettingsHandler::HandleSetCategoryPermissionForOrigin, |
| 148 base::Unretained(this))); | 234 base::Unretained(this))); |
| 149 web_ui()->RegisterMessageCallback( | 235 web_ui()->RegisterMessageCallback( |
| 150 "getSiteDetails", | |
| 151 base::Bind(&SiteSettingsHandler::HandleGetSiteDetails, | |
| 152 base::Unretained(this))); | |
| 153 web_ui()->RegisterMessageCallback( | |
| 154 "isPatternValid", | 236 "isPatternValid", |
| 155 base::Bind(&SiteSettingsHandler::HandleIsPatternValid, | 237 base::Bind(&SiteSettingsHandler::HandleIsPatternValid, |
| 156 base::Unretained(this))); | 238 base::Unretained(this))); |
| 157 web_ui()->RegisterMessageCallback( | 239 web_ui()->RegisterMessageCallback( |
| 158 "updateIncognitoStatus", | 240 "updateIncognitoStatus", |
| 159 base::Bind(&SiteSettingsHandler::HandleUpdateIncognitoStatus, | 241 base::Bind(&SiteSettingsHandler::HandleUpdateIncognitoStatus, |
| 160 base::Unretained(this))); | 242 base::Unretained(this))); |
| 161 web_ui()->RegisterMessageCallback( | 243 web_ui()->RegisterMessageCallback( |
| 162 "fetchZoomLevels", | 244 "fetchZoomLevels", |
| 163 base::Bind(&SiteSettingsHandler::HandleFetchZoomLevels, | 245 base::Bind(&SiteSettingsHandler::HandleFetchZoomLevels, |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 449 map = HostContentSettingsMapFactory::GetForProfile(incognito); | 531 map = HostContentSettingsMapFactory::GetForProfile(incognito); |
| 450 extension_registry = extensions::ExtensionRegistry::Get(incognito); | 532 extension_registry = extensions::ExtensionRegistry::Get(incognito); |
| 451 site_settings::GetExceptionsFromHostContentSettingsMap( | 533 site_settings::GetExceptionsFromHostContentSettingsMap( |
| 452 map, content_type, extension_registry, web_ui(), /*incognito=*/true, | 534 map, content_type, extension_registry, web_ui(), /*incognito=*/true, |
| 453 /*filter=*/nullptr, exceptions.get()); | 535 /*filter=*/nullptr, exceptions.get()); |
| 454 } | 536 } |
| 455 | 537 |
| 456 ResolveJavascriptCallback(*callback_id, *exceptions.get()); | 538 ResolveJavascriptCallback(*callback_id, *exceptions.get()); |
| 457 } | 539 } |
| 458 | 540 |
| 541 void SiteSettingsHandler::HandleGetOriginPermissions( | |
|
calamity
2017/06/29 05:31:26
The real version of this doesn't seem to ever get
tsergeant
2017/06/29 07:14:48
I mentioned this to calamity@ already, but I think
Patti Lor
2017/06/30 01:40:33
Thanks Tim! And yeah I have a follow-up test CL in
| |
| 542 const base::ListValue* args) { | |
| 543 AllowJavascript(); | |
| 544 | |
| 545 CHECK_EQ(3U, args->GetSize()); | |
| 546 const base::Value* callback_id; | |
| 547 CHECK(args->Get(0, &callback_id)); | |
| 548 std::string origin; | |
| 549 CHECK(args->GetString(1, &origin)); | |
| 550 const base::ListValue* types; | |
| 551 CHECK(args->GetList(2, &types)); | |
| 552 | |
| 553 // Note: Invalid URLs will just result in default settings being shown. | |
| 554 const GURL origin_url(origin); | |
| 555 auto exceptions = base::MakeUnique<base::ListValue>(); | |
| 556 for (size_t i = 0; i < types->GetSize(); ++i) { | |
| 557 std::string type; | |
| 558 types->GetString(i, &type); | |
| 559 ContentSettingsType content_type = | |
| 560 static_cast<ContentSettingsType>(static_cast<int>( | |
|
calamity
2017/06/29 05:31:26
These casts are unnecessary.
Patti Lor
2017/06/30 01:40:33
You're right, thanks! Fixed them everywhere (in th
| |
| 561 site_settings::ContentSettingsTypeFromGroupName(type))); | |
| 562 | |
| 563 std::string source_string = ""; | |
|
calamity
2017/06/29 05:31:26
nit: Is this initialization necessary?
Patti Lor
2017/06/30 01:40:33
Nope, fixed! Thanks.
| |
| 564 ContentSetting content_setting = GetContentSettingForOrigin( | |
| 565 origin_url, content_type, profile_, &source_string); | |
| 566 std::string content_setting_string = | |
| 567 content_settings::ContentSettingToString(content_setting); | |
| 568 | |
| 569 auto raw_site_exception = base::MakeUnique<base::DictionaryValue>(); | |
| 570 raw_site_exception->SetString(site_settings::kEmbeddingOrigin, origin); | |
| 571 raw_site_exception->SetBoolean(site_settings::kIncognito, | |
| 572 profile_->IsOffTheRecord()); | |
| 573 raw_site_exception->SetString(site_settings::kOrigin, origin); | |
| 574 raw_site_exception->SetString(site_settings::kDisplayName, origin); | |
| 575 raw_site_exception->SetString(site_settings::kSetting, | |
| 576 content_setting_string); | |
| 577 raw_site_exception->SetString(site_settings::kSource, source_string); | |
| 578 exceptions->Append(std::move(raw_site_exception)); | |
| 579 } | |
| 580 | |
| 581 ResolveJavascriptCallback(*callback_id, *exceptions); | |
| 582 } | |
| 583 | |
| 459 void SiteSettingsHandler::HandleResetCategoryPermissionForOrigin( | 584 void SiteSettingsHandler::HandleResetCategoryPermissionForOrigin( |
| 460 const base::ListValue* args) { | 585 const base::ListValue* args) { |
| 461 CHECK_EQ(4U, args->GetSize()); | 586 CHECK_EQ(4U, args->GetSize()); |
| 462 std::string primary_pattern_string; | 587 std::string primary_pattern_string; |
| 463 CHECK(args->GetString(0, &primary_pattern_string)); | 588 CHECK(args->GetString(0, &primary_pattern_string)); |
| 464 std::string secondary_pattern_string; | 589 std::string secondary_pattern_string; |
| 465 CHECK(args->GetString(1, &secondary_pattern_string)); | 590 CHECK(args->GetString(1, &secondary_pattern_string)); |
| 466 std::string type; | 591 std::string type; |
| 467 CHECK(args->GetString(2, &type)); | 592 CHECK(args->GetString(2, &type)); |
| 468 bool incognito; | 593 bool incognito; |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 544 PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter( | 669 PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter( |
| 545 profile, primary_pattern, secondary_pattern, content_type, | 670 profile, primary_pattern, secondary_pattern, content_type, |
| 546 PermissionSourceUI::SITE_SETTINGS); | 671 PermissionSourceUI::SITE_SETTINGS); |
| 547 | 672 |
| 548 map->SetContentSettingCustomScope(primary_pattern, secondary_pattern, | 673 map->SetContentSettingCustomScope(primary_pattern, secondary_pattern, |
| 549 content_type, "", setting); | 674 content_type, "", setting); |
| 550 | 675 |
| 551 WebSiteSettingsUmaUtil::LogPermissionChange(content_type, setting); | 676 WebSiteSettingsUmaUtil::LogPermissionChange(content_type, setting); |
| 552 } | 677 } |
| 553 | 678 |
| 554 void SiteSettingsHandler::HandleGetSiteDetails( | |
| 555 const base::ListValue* args) { | |
| 556 AllowJavascript(); | |
| 557 | |
| 558 CHECK_EQ(2U, args->GetSize()); | |
| 559 const base::Value* callback_id; | |
| 560 CHECK(args->Get(0, &callback_id)); | |
| 561 std::string site; | |
| 562 CHECK(args->GetString(1, &site)); | |
| 563 | |
| 564 // A subset of the ContentSettingsType enum that we show in the settings UI. | |
| 565 const ContentSettingsType kSettingsDetailTypes[] = { | |
| 566 CONTENT_SETTINGS_TYPE_COOKIES, | |
| 567 CONTENT_SETTINGS_TYPE_IMAGES, | |
| 568 CONTENT_SETTINGS_TYPE_JAVASCRIPT, | |
| 569 CONTENT_SETTINGS_TYPE_PLUGINS, | |
| 570 CONTENT_SETTINGS_TYPE_POPUPS, | |
| 571 CONTENT_SETTINGS_TYPE_GEOLOCATION, | |
| 572 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, | |
| 573 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, | |
| 574 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, | |
| 575 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, | |
| 576 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, | |
| 577 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, | |
| 578 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, | |
| 579 CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT, | |
| 580 }; | |
| 581 | |
| 582 // Create a list to be consistent with existing API, we are expecting a single | |
| 583 // element (or none). | |
| 584 std::unique_ptr<base::ListValue> exceptions(new base::ListValue); | |
| 585 for (size_t type = 0; type < arraysize(kSettingsDetailTypes); ++type) { | |
| 586 ContentSettingsType content_type = kSettingsDetailTypes[type]; | |
| 587 | |
| 588 HostContentSettingsMap* map = | |
| 589 HostContentSettingsMapFactory::GetForProfile(profile_); | |
| 590 const auto* extension_registry = | |
| 591 extensions::ExtensionRegistry::Get(profile_); | |
| 592 site_settings::GetExceptionsFromHostContentSettingsMap( | |
| 593 map, content_type, extension_registry, web_ui(), /*incognito=*/false, | |
| 594 /*filter=*/&site, exceptions.get()); | |
| 595 | |
| 596 if (profile_->HasOffTheRecordProfile()) { | |
| 597 Profile* incognito = profile_->GetOffTheRecordProfile(); | |
| 598 map = HostContentSettingsMapFactory::GetForProfile(incognito); | |
| 599 extension_registry = extensions::ExtensionRegistry::Get(incognito); | |
| 600 site_settings::GetExceptionsFromHostContentSettingsMap( | |
| 601 map, content_type, extension_registry, web_ui(), /*incognito=*/true, | |
| 602 /*filter=*/&site, exceptions.get()); | |
| 603 } | |
| 604 } | |
| 605 | |
| 606 if (!exceptions->GetSize()) { | |
| 607 RejectJavascriptCallback(*callback_id, base::Value()); | |
| 608 return; | |
| 609 } | |
| 610 | |
| 611 // We only need a single response element. | |
| 612 const base::DictionaryValue* exception = nullptr; | |
| 613 exceptions->GetDictionary(0, &exception); | |
| 614 ResolveJavascriptCallback(*callback_id, *exception); | |
| 615 } | |
| 616 | |
| 617 void SiteSettingsHandler::HandleIsPatternValid( | 679 void SiteSettingsHandler::HandleIsPatternValid( |
| 618 const base::ListValue* args) { | 680 const base::ListValue* args) { |
| 619 CHECK_EQ(2U, args->GetSize()); | 681 CHECK_EQ(2U, args->GetSize()); |
| 620 const base::Value* callback_id; | 682 const base::Value* callback_id; |
| 621 CHECK(args->Get(0, &callback_id)); | 683 CHECK(args->Get(0, &callback_id)); |
| 622 std::string pattern_string; | 684 std::string pattern_string; |
| 623 CHECK(args->GetString(1, &pattern_string)); | 685 CHECK(args->GetString(1, &pattern_string)); |
| 624 | 686 |
| 625 ContentSettingsPattern pattern = | 687 ContentSettingsPattern pattern = |
| 626 ContentSettingsPattern::FromString(pattern_string); | 688 ContentSettingsPattern::FromString(pattern_string); |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 749 origin = content::kUnreachableWebDataURL; | 811 origin = content::kUnreachableWebDataURL; |
| 750 } | 812 } |
| 751 | 813 |
| 752 content::HostZoomMap* host_zoom_map; | 814 content::HostZoomMap* host_zoom_map; |
| 753 host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_); | 815 host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_); |
| 754 double default_level = host_zoom_map->GetDefaultZoomLevel(); | 816 double default_level = host_zoom_map->GetDefaultZoomLevel(); |
| 755 host_zoom_map->SetZoomLevelForHost(origin, default_level); | 817 host_zoom_map->SetZoomLevelForHost(origin, default_level); |
| 756 } | 818 } |
| 757 | 819 |
| 758 } // namespace settings | 820 } // namespace settings |
| OLD | NEW |