chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h - Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h

Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 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

« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

OLD	NEW
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 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_PEPPER_FLASH_CONTENT_SETTINGS_UTILS_H_	5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_PEPPER_FLASH_CONTENT_SETTINGS_UTILS_H_

6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_PEPPER_FLASH_CONTENT_SETTINGS_UTILS_H_	6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_PEPPER_FLASH_CONTENT_SETTINGS_UTILS_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "chrome/common/content_settings.h"	10 #include "chrome/common/content_settings.h"

11 #include "chrome/common/content_settings_pattern.h"	11 #include "components/content_settings/core/common/content_settings_pattern.h"

12 #include "ppapi/c/private/ppp_flash_browser_operations.h"	12 #include "ppapi/c/private/ppp_flash_browser_operations.h"

13 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"	13 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"

14	14

15 namespace options {	15 namespace options {

16	16

17 struct MediaException {	17 struct MediaException {

18 MediaException(const ContentSettingsPattern& in_pattern,	18 MediaException(const ContentSettingsPattern& in_pattern,

19 ContentSetting in_audio_setting,	19 ContentSetting in_audio_setting,

20 ContentSetting in_video_setting);	20 ContentSetting in_video_setting);

21 ~MediaException();	21 ~MediaException();

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 const MediaExceptions& exceptions_1,	57 const MediaExceptions& exceptions_1,

58 ContentSetting default_setting_2,	58 ContentSetting default_setting_2,

59 const MediaExceptions& exceptions_2,	59 const MediaExceptions& exceptions_2,

60 bool ignore_audio_setting,	60 bool ignore_audio_setting,

61 bool ignore_video_setting);	61 bool ignore_video_setting);

62 };	62 };

63	63

64 } // namespace options	64 } // namespace options

65	65

66 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_PEPPER_FLASH_CONTENT_SETTINGS_UTILS_H _	66 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_PEPPER_FLASH_CONTENT_SETTINGS_UTILS_H _

OLD	NEW