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

Side by Side Diff: components/content_settings/core/common/content_settings.mojom

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: raymes comments 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 module content_settings.mojom; 5 module content_settings.mojom;
6 6
7 import "mojo/common/values.mojom";
8
7 // This mirrors the C++ type in content_settings_pattern.h. 9 // This mirrors the C++ type in content_settings_pattern.h.
8 struct PatternParts { 10 struct PatternParts {
9 // Lowercase string of the URL scheme to match. This string is empty if the 11 // Lowercase string of the URL scheme to match. This string is empty if the
10 // |is_scheme_wildcard| flag is set. 12 // |is_scheme_wildcard| flag is set.
11 string scheme; 13 string scheme;
12 14
13 // True if the scheme wildcard is set. 15 // True if the scheme wildcard is set.
14 bool is_scheme_wildcard; 16 bool is_scheme_wildcard;
15 17
16 // Normalized string that is either of the following: 18 // Normalized string that is either of the following:
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 BLOCK, 54 BLOCK,
53 ASK, 55 ASK,
54 SESSION_ONLY, 56 SESSION_ONLY,
55 DETECT_IMPORTANT_CONTENT 57 DETECT_IMPORTANT_CONTENT
56 }; 58 };
57 59
58 // This mirrors the C++ type in content_settings.h. 60 // This mirrors the C++ type in content_settings.h.
59 struct ContentSettingPatternSource { 61 struct ContentSettingPatternSource {
60 ContentSettingsPattern primary_pattern; 62 ContentSettingsPattern primary_pattern;
61 ContentSettingsPattern secondary_pattern; 63 ContentSettingsPattern secondary_pattern;
62 ContentSetting setting; 64 mojo.common.mojom.Value? setting_value;
nasko 2017/06/28 20:59:37 Is the setting value really optional?
tbansal1 2017/06/29 15:57:53 Done.
63 string source; 65 string source;
64 bool incognito; 66 bool incognito;
65 }; 67 };
66 68
67 // This mirrors the C++ type in content_settings.h. 69 // This mirrors the C++ type in content_settings.h.
68 struct RendererContentSettingRules { 70 struct RendererContentSettingRules {
69 array<ContentSettingPatternSource> image_rules; 71 array<ContentSettingPatternSource> image_rules;
70 array<ContentSettingPatternSource> script_rules; 72 array<ContentSettingPatternSource> script_rules;
71 array<ContentSettingPatternSource> autoplay_rules; 73 array<ContentSettingPatternSource> autoplay_rules;
72 }; 74 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698