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" |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 localized_strings->SetString("addExceptionRow", | 191 localized_strings->SetString("addExceptionRow", |
192 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ADD_BUTTON)); | 192 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ADD_BUTTON)); |
193 localized_strings->SetString("removeExceptionRow", | 193 localized_strings->SetString("removeExceptionRow", |
194 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_REMOVE_BUTTON)); | 194 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_REMOVE_BUTTON)); |
195 localized_strings->SetString("editExceptionRow", | 195 localized_strings->SetString("editExceptionRow", |
196 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_EDIT_BUTTON)); | 196 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_EDIT_BUTTON)); |
197 localized_strings->SetString("otr_exceptions_explanation", | 197 localized_strings->SetString("otr_exceptions_explanation", |
198 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_OTR_LABEL)); | 198 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_OTR_LABEL)); |
199 localized_strings->SetString("examplePattern", | 199 localized_strings->SetString("examplePattern", |
200 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_PATTERN_EXAMPLE)); | 200 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_PATTERN_EXAMPLE)); |
| 201 localized_strings->SetString("addNewExceptionInstructions", |
| 202 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ADD_NEW_INSTRUCTIONS)); |
201 | 203 |
202 // Cookies filter. | 204 // Cookies filter. |
203 localized_strings->SetString("cookies_tab_label", | 205 localized_strings->SetString("cookies_tab_label", |
204 l10n_util::GetStringUTF16(IDS_COOKIES_TAB_LABEL)); | 206 l10n_util::GetStringUTF16(IDS_COOKIES_TAB_LABEL)); |
205 localized_strings->SetString("cookies_allow", | 207 localized_strings->SetString("cookies_allow", |
206 l10n_util::GetStringUTF16(IDS_COOKIES_ALLOW_RADIO)); | 208 l10n_util::GetStringUTF16(IDS_COOKIES_ALLOW_RADIO)); |
207 localized_strings->SetString("cookies_ask", | 209 localized_strings->SetString("cookies_ask", |
208 l10n_util::GetStringUTF16(IDS_COOKIES_ASK_EVERY_TIME_RADIO)); | 210 l10n_util::GetStringUTF16(IDS_COOKIES_ASK_EVERY_TIME_RADIO)); |
209 localized_strings->SetString("cookies_block", | 211 localized_strings->SetString("cookies_block", |
210 l10n_util::GetStringUTF16(IDS_COOKIES_BLOCK_RADIO)); | 212 l10n_util::GetStringUTF16(IDS_COOKIES_BLOCK_RADIO)); |
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
730 return dom_ui_->GetProfile()->GetHostContentSettingsMap(); | 732 return dom_ui_->GetProfile()->GetHostContentSettingsMap(); |
731 } | 733 } |
732 | 734 |
733 HostContentSettingsMap* | 735 HostContentSettingsMap* |
734 ContentSettingsHandler::GetOTRContentSettingsMap() { | 736 ContentSettingsHandler::GetOTRContentSettingsMap() { |
735 Profile* profile = dom_ui_->GetProfile(); | 737 Profile* profile = dom_ui_->GetProfile(); |
736 if (profile->HasOffTheRecordProfile()) | 738 if (profile->HasOffTheRecordProfile()) |
737 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); | 739 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); |
738 return NULL; | 740 return NULL; |
739 } | 741 } |
OLD | NEW |