chrome/browser/ui/webui/options/content_settings_handler.cc - Issue 19073003: Update some includes of chrome_notification_types.h

Side by Side Diff: chrome/browser/ui/webui/options/content_settings_handler.cc

Issue 19073003: Update some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc ('k') | chrome/browser/ui/webui/options/core_options_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #include "chrome/browser/ui/webui/options/content_settings_handler.h"	5 #include "chrome/browser/ui/webui/options/content_settings_handler.h"

6	6

7 #include <map>	7 #include <map>

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

9	9

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "base/bind_helpers.h"	11 #include "base/bind_helpers.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/prefs/pref_service.h"	13 #include "base/prefs/pref_service.h"

14 #include "base/strings/utf_string_conversions.h"	14 #include "base/strings/utf_string_conversions.h"

15 #include "base/values.h"	15 #include "base/values.h"

16 #include "chrome/browser/browser_process.h"	16 #include "chrome/browser/browser_process.h"

	17 #include "chrome/browser/chrome_notification_types.h"

17 #include "chrome/browser/content_settings/content_settings_details.h"	18 #include "chrome/browser/content_settings/content_settings_details.h"

18 #include "chrome/browser/content_settings/content_settings_utils.h"	19 #include "chrome/browser/content_settings/content_settings_utils.h"

19 #include "chrome/browser/content_settings/host_content_settings_map.h"	20 #include "chrome/browser/content_settings/host_content_settings_map.h"

20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"	21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"

21 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"	22 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"

22 #include "chrome/browser/extensions/extension_service.h"	23 #include "chrome/browser/extensions/extension_service.h"

23 #include "chrome/browser/extensions/extension_special_storage_policy.h"	24 #include "chrome/browser/extensions/extension_special_storage_policy.h"

24 #include "chrome/browser/google/google_util.h"	25 #include "chrome/browser/google/google_util.h"

25 #include "chrome/browser/notifications/desktop_notification_service.h"	26 #include "chrome/browser/notifications/desktop_notification_service.h"

26 #include "chrome/browser/notifications/desktop_notification_service_factory.h"	27 #include "chrome/browser/notifications/desktop_notification_service_factory.h"

27 #include "chrome/browser/profiles/profile.h"	28 #include "chrome/browser/profiles/profile.h"

28 #include "chrome/browser/ui/browser_list.h"	29 #include "chrome/browser/ui/browser_list.h"

29 #include "chrome/common/chrome_notification_types.h"

30 #include "chrome/common/chrome_switches.h"	30 #include "chrome/common/chrome_switches.h"

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

32 #include "chrome/common/content_settings_pattern.h"	32 #include "chrome/common/content_settings_pattern.h"

33 #include "chrome/common/extensions/extension_set.h"	33 #include "chrome/common/extensions/extension_set.h"

34 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"	34 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

35 #include "chrome/common/extensions/permissions/api_permission.h"	35 #include "chrome/common/extensions/permissions/api_permission.h"

36 #include "chrome/common/pref_names.h"	36 #include "chrome/common/pref_names.h"

37 #include "chrome/common/url_constants.h"	37 #include "chrome/common/url_constants.h"

38 #include "content/public/browser/notification_service.h"	38 #include "content/public/browser/notification_service.h"

39 #include "content/public/browser/notification_source.h"	39 #include "content/public/browser/notification_source.h"

(...skipping 1367 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1407 media_settings_.flash_default_setting,	1407 media_settings_.flash_default_setting,

1408 media_settings_.flash_exceptions,	1408 media_settings_.flash_exceptions,

1409 media_settings_.policy_disable_audio,	1409 media_settings_.policy_disable_audio,

1410 media_settings_.policy_disable_video)) {	1410 media_settings_.policy_disable_video)) {

1411 ShowFlashMediaLink(EXCEPTIONS, true);	1411 ShowFlashMediaLink(EXCEPTIONS, true);

1412 }	1412 }

1413 }	1413 }

1414 }	1414 }

1415	1415

1416 } // namespace options	1416 } // namespace options

OLD	NEW