chrome/browser/ui/webui/options/content_settings_handler.h - Issue 410993002: Componentize content_settings_types.h

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/content_settings_handler.h

Issue 410993002: Componentize content_settings_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: removed empty DEPS Created 6 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/website_settings/website_settings_unittest.cc ('k') | chrome/chrome_browser.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_CONTENT_SETTINGS_HANDLER_H_	5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_

6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_	6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "base/prefs/pref_change_registrar.h"	11 #include "base/prefs/pref_change_registrar.h"

12 #include "chrome/browser/pepper_flash_settings_manager.h"	12 #include "chrome/browser/pepper_flash_settings_manager.h"

13 #include "chrome/browser/ui/webui/options/options_ui.h"	13 #include "chrome/browser/ui/webui/options/options_ui.h"

14 #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h"	14 #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h"

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

16 #include "chrome/common/content_settings_types.h"	16 #include "components/content_settings/core/common/content_settings_types.h"

17 #include "content/public/browser/host_zoom_map.h"	17 #include "content/public/browser/host_zoom_map.h"

18 #include "content/public/browser/notification_observer.h"	18 #include "content/public/browser/notification_observer.h"

19 #include "content/public/browser/notification_registrar.h"	19 #include "content/public/browser/notification_registrar.h"

20	20

21 class HostContentSettingsMap;	21 class HostContentSettingsMap;

22 class ProtocolHandlerRegistry;	22 class ProtocolHandlerRegistry;

23	23

24 namespace options {	24 namespace options {

25	25

26 class ContentSettingsHandler : public OptionsPageUIHandler,	26 class ContentSettingsHandler : public OptionsPageUIHandler,

(...skipping 194 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
221 scoped_ptr<PepperFlashSettingsManager> flash_settings_manager_;	221 scoped_ptr<PepperFlashSettingsManager> flash_settings_manager_;

222 MediaSettingsInfo media_settings_;	222 MediaSettingsInfo media_settings_;

223 scoped_ptr<content::HostZoomMap::Subscription> host_zoom_map_subscription_;	223 scoped_ptr<content::HostZoomMap::Subscription> host_zoom_map_subscription_;

224	224

225 DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);	225 DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);

226 };	226 };

227	227

228 } // namespace options	228 } // namespace options

229	229

230 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_	230 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_

OLD	NEW