OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 22 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
23 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
24 #include "chrome/browser/ui/browser_list.h" | 24 #include "chrome/browser/ui/browser_list.h" |
25 #include "chrome/common/chrome_notification_types.h" | 25 #include "chrome/common/chrome_notification_types.h" |
26 #include "chrome/common/chrome_switches.h" | 26 #include "chrome/common/chrome_switches.h" |
27 #include "chrome/common/content_settings_pattern.h" | 27 #include "chrome/common/content_settings_pattern.h" |
28 #include "chrome/common/pref_names.h" | 28 #include "chrome/common/pref_names.h" |
29 #include "chrome/common/url_constants.h" | 29 #include "chrome/common/url_constants.h" |
30 #include "content/browser/tab_contents/tab_contents.h" | 30 #include "content/browser/tab_contents/tab_contents.h" |
31 #include "content/common/content_notification_types.h" | 31 #include "content/common/content_notification_types.h" |
32 #include "content/common/content_switches.h" | |
33 #include "content/common/notification_service.h" | 32 #include "content/common/notification_service.h" |
34 #include "content/common/notification_source.h" | 33 #include "content/common/notification_source.h" |
| 34 #include "content/public/common/content_switches.h" |
35 #include "grit/generated_resources.h" | 35 #include "grit/generated_resources.h" |
36 #include "grit/locale_settings.h" | 36 #include "grit/locale_settings.h" |
37 #include "ui/base/l10n/l10n_util.h" | 37 #include "ui/base/l10n/l10n_util.h" |
38 | 38 |
39 namespace { | 39 namespace { |
40 | 40 |
41 struct ContentSettingsTypeNameEntry { | 41 struct ContentSettingsTypeNameEntry { |
42 ContentSettingsType type; | 42 ContentSettingsType type; |
43 const char* name; | 43 const char* name; |
44 }; | 44 }; |
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
788 return Profile::FromWebUI(web_ui_)->GetProtocolHandlerRegistry(); | 788 return Profile::FromWebUI(web_ui_)->GetProtocolHandlerRegistry(); |
789 } | 789 } |
790 | 790 |
791 HostContentSettingsMap* | 791 HostContentSettingsMap* |
792 ContentSettingsHandler::GetOTRContentSettingsMap() { | 792 ContentSettingsHandler::GetOTRContentSettingsMap() { |
793 Profile* profile = Profile::FromWebUI(web_ui_); | 793 Profile* profile = Profile::FromWebUI(web_ui_); |
794 if (profile->HasOffTheRecordProfile()) | 794 if (profile->HasOffTheRecordProfile()) |
795 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); | 795 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); |
796 return NULL; | 796 return NULL; |
797 } | 797 } |
OLD | NEW |