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

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

Issue 302663003: Fixed an old TODO to use IDS_PPAPI_BROKER_HEADER. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 { "mediaAudioExceptionHeader", IDS_MEDIA_AUDIO_EXCEPTION_HEADER }, 389 { "mediaAudioExceptionHeader", IDS_MEDIA_AUDIO_EXCEPTION_HEADER },
390 { "mediaVideoExceptionHeader", IDS_MEDIA_VIDEO_EXCEPTION_HEADER }, 390 { "mediaVideoExceptionHeader", IDS_MEDIA_VIDEO_EXCEPTION_HEADER },
391 { "mediaPepperFlashDefaultDivergedLabel", 391 { "mediaPepperFlashDefaultDivergedLabel",
392 IDS_MEDIA_PEPPER_FLASH_DEFAULT_DIVERGED_LABEL }, 392 IDS_MEDIA_PEPPER_FLASH_DEFAULT_DIVERGED_LABEL },
393 { "mediaPepperFlashExceptionsDivergedLabel", 393 { "mediaPepperFlashExceptionsDivergedLabel",
394 IDS_MEDIA_PEPPER_FLASH_EXCEPTIONS_DIVERGED_LABEL }, 394 IDS_MEDIA_PEPPER_FLASH_EXCEPTIONS_DIVERGED_LABEL },
395 { "mediaPepperFlashChangeLink", IDS_MEDIA_PEPPER_FLASH_CHANGE_LINK }, 395 { "mediaPepperFlashChangeLink", IDS_MEDIA_PEPPER_FLASH_CHANGE_LINK },
396 { "mediaPepperFlashGlobalPrivacyURL", IDS_FLASH_GLOBAL_PRIVACY_URL }, 396 { "mediaPepperFlashGlobalPrivacyURL", IDS_FLASH_GLOBAL_PRIVACY_URL },
397 { "mediaPepperFlashWebsitePrivacyURL", IDS_FLASH_WEBSITE_PRIVACY_URL }, 397 { "mediaPepperFlashWebsitePrivacyURL", IDS_FLASH_WEBSITE_PRIVACY_URL },
398 // PPAPI broker filter. 398 // PPAPI broker filter.
399 // TODO(bauerb): Use IDS_PPAPI_BROKER_HEADER. 399 { "ppapi-broker_header", IDS_PPAPI_BROKER_HEADER },
400 { "ppapi-broker_header", IDS_PPAPI_BROKER_TAB_LABEL },
401 { "ppapiBrokerTabLabel", IDS_PPAPI_BROKER_TAB_LABEL }, 400 { "ppapiBrokerTabLabel", IDS_PPAPI_BROKER_TAB_LABEL },
402 { "ppapi_broker_allow", IDS_PPAPI_BROKER_ALLOW_RADIO }, 401 { "ppapi_broker_allow", IDS_PPAPI_BROKER_ALLOW_RADIO },
403 { "ppapi_broker_ask", IDS_PPAPI_BROKER_ASK_RADIO }, 402 { "ppapi_broker_ask", IDS_PPAPI_BROKER_ASK_RADIO },
404 { "ppapi_broker_block", IDS_PPAPI_BROKER_BLOCK_RADIO }, 403 { "ppapi_broker_block", IDS_PPAPI_BROKER_BLOCK_RADIO },
405 // Multiple automatic downloads 404 // Multiple automatic downloads
406 { "multiple-automatic-downloads_header", 405 { "multiple-automatic-downloads_header",
407 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL }, 406 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL },
408 { "multiple-automatic-downloads_allow", 407 { "multiple-automatic-downloads_allow",
409 IDS_AUTOMATIC_DOWNLOADS_ALLOW_RADIO }, 408 IDS_AUTOMATIC_DOWNLOADS_ALLOW_RADIO },
410 { "multiple-automatic-downloads_ask", 409 { "multiple-automatic-downloads_ask",
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1564 void ContentSettingsHandler::UpdateProtectedContentExceptionsButton() { 1563 void ContentSettingsHandler::UpdateProtectedContentExceptionsButton() {
1565 PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs(); 1564 PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
1566 // Exceptions apply only when the feature is enabled. 1565 // Exceptions apply only when the feature is enabled.
1567 bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM); 1566 bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
1568 web_ui()->CallJavascriptFunction( 1567 web_ui()->CallJavascriptFunction(
1569 "ContentSettings.enableProtectedContentExceptions", 1568 "ContentSettings.enableProtectedContentExceptions",
1570 base::FundamentalValue(enable_exceptions)); 1569 base::FundamentalValue(enable_exceptions));
1571 } 1570 }
1572 1571
1573 } // namespace options 1572 } // namespace options
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698