chrome/renderer/content_settings_observer.h - Issue 541813002: Componentize chrome/common/content_settings files.

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/renderer/content_settings_observer.h

Issue 541813002: Componentize chrome/common/content_settings files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix 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

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_RENDERER_CONTENT_SETTINGS_OBSERVER_H_	5 #ifndef CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_

6 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_	6 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_

7	7

8 #include <map>	8 #include <map>

9 #include <set>	9 #include <set>

10	10

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

12 #include "components/content_settings/core/common/content_settings_types.h"	12 #include "components/content_settings/core/common/content_settings_types.h"

13 #include "content/public/renderer/render_frame_observer.h"	13 #include "content/public/renderer/render_frame_observer.h"

14 #include "content/public/renderer/render_frame_observer_tracker.h"	14 #include "content/public/renderer/render_frame_observer_tracker.h"

15 #include "third_party/WebKit/public/web/WebPermissionClient.h"	15 #include "third_party/WebKit/public/web/WebPermissionClient.h"

16	16

17 class GURL;	17 class GURL;

18	18

19 namespace blink {	19 namespace blink {

20 class WebFrame;	20 class WebFrame;

21 class WebSecurityOrigin;	21 class WebSecurityOrigin;

(...skipping 129 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
151 bool npapi_plugins_blocked_;	151 bool npapi_plugins_blocked_;

152	152

153 int current_request_id_;	153 int current_request_id_;

154 typedef std::map<int, blink::WebPermissionCallbacks> PermissionRequestMap;	154 typedef std::map<int, blink::WebPermissionCallbacks> PermissionRequestMap;

155 PermissionRequestMap permission_requests_;	155 PermissionRequestMap permission_requests_;

156	156

157 DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);	157 DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);

158 };	158 };

159	159

160 #endif // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_	160 #endif // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_

OLD	NEW