Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: chrome/browser/ui/webui/settings/site_settings_handler.cc

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: rebased Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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>
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/permissions/permission_result.h" 22 #include "chrome/browser/permissions/permission_result.h"
23 #include "chrome/browser/permissions/permission_uma_util.h" 23 #include "chrome/browser/permissions/permission_uma_util.h"
24 #include "chrome/browser/permissions/permission_util.h" 24 #include "chrome/browser/permissions/permission_util.h"
25 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/browser/ui/webui/site_settings_helper.h" 26 #include "chrome/browser/ui/webui/site_settings_helper.h"
27 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 27 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
28 #include "chrome/grit/generated_resources.h" 28 #include "chrome/grit/generated_resources.h"
29 #include "components/content_settings/core/browser/content_settings_utils.h" 29 #include "components/content_settings/core/browser/content_settings_utils.h"
30 #include "components/content_settings/core/browser/host_content_settings_map.h" 30 #include "components/content_settings/core/browser/host_content_settings_map.h"
31 #include "components/content_settings/core/common/content_settings_types.h" 31 #include "components/content_settings/core/common/content_settings_types.h"
32 #include "components/content_settings/core/common/content_settings_utils.h"
32 #include "components/crx_file/id_util.h" 33 #include "components/crx_file/id_util.h"
33 #include "content/public/browser/browser_thread.h" 34 #include "content/public/browser/browser_thread.h"
34 #include "content/public/browser/notification_service.h" 35 #include "content/public/browser/notification_service.h"
35 #include "content/public/browser/web_ui.h" 36 #include "content/public/browser/web_ui.h"
36 #include "content/public/common/page_zoom.h" 37 #include "content/public/common/page_zoom.h"
37 #include "content/public/common/url_constants.h" 38 #include "content/public/common/url_constants.h"
38 #include "extensions/browser/extension_registry.h" 39 #include "extensions/browser/extension_registry.h"
39 #include "extensions/common/permissions/api_permission.h" 40 #include "extensions/common/permissions/api_permission.h"
40 #include "extensions/common/permissions/permissions_data.h" 41 #include "extensions/common/permissions/permissions_data.h"
41 #include "storage/browser/quota/quota_manager.h" 42 #include "storage/browser/quota/quota_manager.h"
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 origin = content::kUnreachableWebDataURL; 806 origin = content::kUnreachableWebDataURL;
806 } 807 }
807 808
808 content::HostZoomMap* host_zoom_map; 809 content::HostZoomMap* host_zoom_map;
809 host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_); 810 host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_);
810 double default_level = host_zoom_map->GetDefaultZoomLevel(); 811 double default_level = host_zoom_map->GetDefaultZoomLevel();
811 host_zoom_map->SetZoomLevelForHost(origin, default_level); 812 host_zoom_map->SetZoomLevelForHost(origin, default_level);
812 } 813 }
813 814
814 } // namespace settings 815 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | chrome/browser/ui/webui/site_settings_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698