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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/content_settings/content_setting_bubble_model.h" 5 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/feature_list.h" 10 #include "base/feature_list.h"
(...skipping 25 matching lines...) Expand all
36 #include "chrome/common/chrome_features.h" 36 #include "chrome/common/chrome_features.h"
37 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
38 #include "chrome/common/insecure_content_renderer.mojom.h" 38 #include "chrome/common/insecure_content_renderer.mojom.h"
39 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
40 #include "chrome/common/render_messages.h" 40 #include "chrome/common/render_messages.h"
41 #include "chrome/grit/generated_resources.h" 41 #include "chrome/grit/generated_resources.h"
42 #include "chrome/grit/theme_resources.h" 42 #include "chrome/grit/theme_resources.h"
43 #include "components/content_settings/core/browser/content_settings_utils.h" 43 #include "components/content_settings/core/browser/content_settings_utils.h"
44 #include "components/content_settings/core/browser/cookie_settings.h" 44 #include "components/content_settings/core/browser/cookie_settings.h"
45 #include "components/content_settings/core/common/content_settings.h" 45 #include "components/content_settings/core/common/content_settings.h"
46 #include "components/content_settings/core/common/content_settings_utils.h"
46 #include "components/prefs/pref_service.h" 47 #include "components/prefs/pref_service.h"
47 #include "components/rappor/public/rappor_utils.h" 48 #include "components/rappor/public/rappor_utils.h"
48 #include "components/rappor/rappor_service_impl.h" 49 #include "components/rappor/rappor_service_impl.h"
49 #include "components/strings/grit/components_strings.h" 50 #include "components/strings/grit/components_strings.h"
50 #include "components/subresource_filter/core/browser/subresource_filter_constant s.h" 51 #include "components/subresource_filter/core/browser/subresource_filter_constant s.h"
51 #include "components/subresource_filter/core/browser/subresource_filter_features .h" 52 #include "components/subresource_filter/core/browser/subresource_filter_features .h"
52 #include "components/url_formatter/elide_url.h" 53 #include "components/url_formatter/elide_url.h"
53 #include "content/public/browser/notification_service.h" 54 #include "content/public/browser/notification_service.h"
54 #include "content/public/browser/render_frame_host.h" 55 #include "content/public/browser/render_frame_host.h"
55 #include "content/public/browser/render_process_host.h" 56 #include "content/public/browser/render_process_host.h"
(...skipping 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after
1610 1611
1611 ContentSettingSubresourceFilterBubbleModel* 1612 ContentSettingSubresourceFilterBubbleModel*
1612 ContentSettingBubbleModel::AsSubresourceFilterBubbleModel() { 1613 ContentSettingBubbleModel::AsSubresourceFilterBubbleModel() {
1613 return nullptr; 1614 return nullptr;
1614 } 1615 }
1615 1616
1616 ContentSettingDownloadsBubbleModel* 1617 ContentSettingDownloadsBubbleModel*
1617 ContentSettingBubbleModel::AsDownloadsBubbleModel() { 1618 ContentSettingBubbleModel::AsDownloadsBubbleModel() {
1618 return nullptr; 1619 return nullptr;
1619 } 1620 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698