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

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

Issue 14569010: Enable the settings UI to toggle the device ID on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 7 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 | Annotate | Revision Log
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 <map> 7 #include <map>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 { "notifications_block", IDS_NOTIFICATIONS_BLOCK_RADIO }, 333 { "notifications_block", IDS_NOTIFICATIONS_BLOCK_RADIO },
334 // Fullscreen filter. 334 // Fullscreen filter.
335 { "fullscreen_tab_label", IDS_FULLSCREEN_TAB_LABEL }, 335 { "fullscreen_tab_label", IDS_FULLSCREEN_TAB_LABEL },
336 { "fullscreen_header", IDS_FULLSCREEN_HEADER }, 336 { "fullscreen_header", IDS_FULLSCREEN_HEADER },
337 // Mouse Lock filter. 337 // Mouse Lock filter.
338 { "mouselock_tab_label", IDS_MOUSE_LOCK_TAB_LABEL }, 338 { "mouselock_tab_label", IDS_MOUSE_LOCK_TAB_LABEL },
339 { "mouselock_header", IDS_MOUSE_LOCK_HEADER }, 339 { "mouselock_header", IDS_MOUSE_LOCK_HEADER },
340 { "mouselock_allow", IDS_MOUSE_LOCK_ALLOW_RADIO }, 340 { "mouselock_allow", IDS_MOUSE_LOCK_ALLOW_RADIO },
341 { "mouselock_ask", IDS_MOUSE_LOCK_ASK_RADIO }, 341 { "mouselock_ask", IDS_MOUSE_LOCK_ASK_RADIO },
342 { "mouselock_block", IDS_MOUSE_LOCK_BLOCK_RADIO }, 342 { "mouselock_block", IDS_MOUSE_LOCK_BLOCK_RADIO },
343 #if defined(OS_CHROMEOS) 343 #if defined(OS_CHROMEOS) || defined(OS_WIN)
344 // Protected Content filter 344 // Protected Content filter
345 { "protectedContentTabLabel", IDS_PROTECTED_CONTENT_TAB_LABEL }, 345 { "protectedContentTabLabel", IDS_PROTECTED_CONTENT_TAB_LABEL },
346 { "protectedContentInfo", IDS_PROTECTED_CONTENT_INFO }, 346 { "protectedContentInfo", IDS_PROTECTED_CONTENT_INFO },
347 { "protectedContentEnable", IDS_PROTECTED_CONTENT_ENABLE}, 347 { "protectedContentEnable", IDS_PROTECTED_CONTENT_ENABLE},
348 #endif // defined(OS_CHROMEOS) 348 #endif // defined(OS_CHROMEOS) || defined(OS_WIN)
349 // Media stream capture device filter. 349 // Media stream capture device filter.
350 { "mediaStreamTabLabel", IDS_MEDIA_STREAM_TAB_LABEL }, 350 { "mediaStreamTabLabel", IDS_MEDIA_STREAM_TAB_LABEL },
351 { "media-stream_header", IDS_MEDIA_STREAM_HEADER }, 351 { "media-stream_header", IDS_MEDIA_STREAM_HEADER },
352 { "mediaStreamAsk", IDS_MEDIA_STREAM_ASK_RADIO }, 352 { "mediaStreamAsk", IDS_MEDIA_STREAM_ASK_RADIO },
353 { "mediaStreamBlock", IDS_MEDIA_STREAM_BLOCK_RADIO }, 353 { "mediaStreamBlock", IDS_MEDIA_STREAM_BLOCK_RADIO },
354 { "mediaStreamAudioAsk", IDS_MEDIA_STREAM_ASK_AUDIO_ONLY_RADIO }, 354 { "mediaStreamAudioAsk", IDS_MEDIA_STREAM_ASK_AUDIO_ONLY_RADIO },
355 { "mediaStreamAudioBlock", IDS_MEDIA_STREAM_BLOCK_AUDIO_ONLY_RADIO }, 355 { "mediaStreamAudioBlock", IDS_MEDIA_STREAM_BLOCK_AUDIO_ONLY_RADIO },
356 { "mediaStreamVideoAsk", IDS_MEDIA_STREAM_ASK_VIDEO_ONLY_RADIO }, 356 { "mediaStreamVideoAsk", IDS_MEDIA_STREAM_ASK_VIDEO_ONLY_RADIO },
357 { "mediaStreamVideoBlock", IDS_MEDIA_STREAM_BLOCK_VIDEO_ONLY_RADIO }, 357 { "mediaStreamVideoBlock", IDS_MEDIA_STREAM_BLOCK_VIDEO_ONLY_RADIO },
358 { "mediaStreamBubbleAudio", IDS_MEDIA_STREAM_AUDIO_MANAGED }, 358 { "mediaStreamBubbleAudio", IDS_MEDIA_STREAM_AUDIO_MANAGED },
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1383 media_settings_.flash_default_setting, 1383 media_settings_.flash_default_setting,
1384 media_settings_.flash_exceptions, 1384 media_settings_.flash_exceptions,
1385 media_settings_.policy_disable_audio, 1385 media_settings_.policy_disable_audio,
1386 media_settings_.policy_disable_video)) { 1386 media_settings_.policy_disable_video)) {
1387 ShowFlashMediaLink(EXCEPTIONS, true); 1387 ShowFlashMediaLink(EXCEPTIONS, true);
1388 } 1388 }
1389 } 1389 }
1390 } 1390 }
1391 1391
1392 } // namespace options 1392 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/content_settings.html ('k') | chrome/common/extensions/api/privacy.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698