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

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

Issue 31043008: Changed platform verification user consent logic to be per-domain. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browser_tests Created 7 years, 1 month 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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 case CONTENT_SETTINGS_TYPE_SAVE_PASSWORD: 706 case CONTENT_SETTINGS_TYPE_SAVE_PASSWORD:
707 // There is no user facing UI for this content type and we skip it here. 707 // There is no user facing UI for this content type and we skip it here.
708 break; 708 break;
709 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: 709 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
710 UpdateMIDISysExExceptionsView(); 710 UpdateMIDISysExExceptionsView();
711 break; 711 break;
712 #if defined(OS_WIN) 712 #if defined(OS_WIN)
713 case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP: 713 case CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP:
714 break; 714 break;
715 #endif 715 #endif
716 #if defined(OS_CHROMEOS)
717 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
718 break;
719 #endif
716 default: 720 default:
717 UpdateExceptionsViewFromHostContentSettingsMap(type); 721 UpdateExceptionsViewFromHostContentSettingsMap(type);
718 break; 722 break;
719 } 723 }
720 } 724 }
721 725
722 void ContentSettingsHandler::UpdateOTRExceptionsViewFromModel( 726 void ContentSettingsHandler::UpdateOTRExceptionsViewFromModel(
723 ContentSettingsType type) { 727 ContentSettingsType type) {
724 switch (type) { 728 switch (type) {
725 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 729 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1439 media_settings_.flash_default_setting, 1443 media_settings_.flash_default_setting,
1440 media_settings_.flash_exceptions, 1444 media_settings_.flash_exceptions,
1441 media_settings_.policy_disable_audio, 1445 media_settings_.policy_disable_audio,
1442 media_settings_.policy_disable_video)) { 1446 media_settings_.policy_disable_video)) {
1443 ShowFlashMediaLink(EXCEPTIONS, true); 1447 ShowFlashMediaLink(EXCEPTIONS, true);
1444 } 1448 }
1445 } 1449 }
1446 } 1450 }
1447 1451
1448 } // namespace options 1452 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/content_settings/content_settings_utils.cc ('k') | chrome/common/content_settings_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698