OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/dom_ui/options/content_settings_handler.h" | 5 #include "chrome/browser/dom_ui/options/content_settings_handler.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "base/values.h" | 11 #include "base/values.h" |
12 #include "chrome/browser/browser_list.h" | 12 #include "chrome/browser/browser_list.h" |
| 13 #include "chrome/browser/content_settings/host_content_settings_map.h" |
13 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" | 14 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" |
14 #include "chrome/browser/host_content_settings_map.h" | |
15 #include "chrome/browser/notifications/desktop_notification_service.h" | 15 #include "chrome/browser/notifications/desktop_notification_service.h" |
16 #include "chrome/browser/profile.h" | 16 #include "chrome/browser/profile.h" |
17 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
18 #include "chrome/common/content_settings_helper.h" | 18 #include "chrome/common/content_settings_helper.h" |
19 #include "chrome/common/notification_service.h" | 19 #include "chrome/common/notification_service.h" |
20 #include "chrome/common/notification_source.h" | 20 #include "chrome/common/notification_source.h" |
21 #include "chrome/common/notification_type.h" | 21 #include "chrome/common/notification_type.h" |
22 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
23 #include "chrome/common/url_constants.h" | 23 #include "chrome/common/url_constants.h" |
24 #include "grit/generated_resources.h" | 24 #include "grit/generated_resources.h" |
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
746 return dom_ui_->GetProfile()->GetHostContentSettingsMap(); | 746 return dom_ui_->GetProfile()->GetHostContentSettingsMap(); |
747 } | 747 } |
748 | 748 |
749 HostContentSettingsMap* | 749 HostContentSettingsMap* |
750 ContentSettingsHandler::GetOTRContentSettingsMap() { | 750 ContentSettingsHandler::GetOTRContentSettingsMap() { |
751 Profile* profile = dom_ui_->GetProfile(); | 751 Profile* profile = dom_ui_->GetProfile(); |
752 if (profile->HasOffTheRecordProfile()) | 752 if (profile->HasOffTheRecordProfile()) |
753 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); | 753 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); |
754 return NULL; | 754 return NULL; |
755 } | 755 } |
OLD | NEW |