Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: chrome/browser/dom_ui/options/content_settings_handler.cc

Issue 6093001: Some RTL fixes for tabbed options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more Created 10 years 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
OLDNEW
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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 171
172 ContentSettingsHandler::~ContentSettingsHandler() { 172 ContentSettingsHandler::~ContentSettingsHandler() {
173 } 173 }
174 174
175 void ContentSettingsHandler::GetLocalizedValues( 175 void ContentSettingsHandler::GetLocalizedValues(
176 DictionaryValue* localized_strings) { 176 DictionaryValue* localized_strings) {
177 DCHECK(localized_strings); 177 DCHECK(localized_strings);
178 178
179 localized_strings->SetString("content_exceptions", 179 localized_strings->SetString("content_exceptions",
180 l10n_util::GetStringUTF16(IDS_COOKIES_EXCEPTIONS_BUTTON)); 180 l10n_util::GetStringUTF16(IDS_COOKIES_EXCEPTIONS_BUTTON));
181 localized_strings->SetString("contentSettingsPage", 181 localized_strings->SetString("content_settings_page",
James Hawkins 2010/12/23 01:53:28 nit: Sorry I missed this before. This isn't in a s
182 l10n_util::GetStringUTF16(IDS_CONTENT_SETTINGS_TITLE)); 182 l10n_util::GetStringUTF16(IDS_CONTENT_SETTINGS_TITLE));
183 localized_strings->SetString("allowException", 183 localized_strings->SetString("allowException",
184 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON)); 184 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON));
185 localized_strings->SetString("blockException", 185 localized_strings->SetString("blockException",
186 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON)); 186 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON));
187 localized_strings->SetString("sessionException", 187 localized_strings->SetString("sessionException",
188 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON)); 188 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON));
189 localized_strings->SetString("askException", 189 localized_strings->SetString("askException",
190 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ASK_BUTTON)); 190 l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ASK_BUTTON));
191 localized_strings->SetString("addExceptionRow", 191 localized_strings->SetString("addExceptionRow",
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 return dom_ui_->GetProfile()->GetHostContentSettingsMap(); 762 return dom_ui_->GetProfile()->GetHostContentSettingsMap();
763 } 763 }
764 764
765 HostContentSettingsMap* 765 HostContentSettingsMap*
766 ContentSettingsHandler::GetOTRContentSettingsMap() { 766 ContentSettingsHandler::GetOTRContentSettingsMap() {
767 Profile* profile = dom_ui_->GetProfile(); 767 Profile* profile = dom_ui_->GetProfile();
768 if (profile->HasOffTheRecordProfile()) 768 if (profile->HasOffTheRecordProfile())
769 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); 769 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
770 return NULL; 770 return NULL;
771 } 771 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698