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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 2539363004: Make base::Value::TYPE a scoped enum. (Closed)
Patch Set: Rebase Created 4 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
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/website_settings/website_settings.h" 5 #include "chrome/browser/ui/website_settings/website_settings.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 for (size_t i = 0; i < arraysize(kPermissionType); ++i) { 702 for (size_t i = 0; i < arraysize(kPermissionType); ++i) {
703 permission_info.type = kPermissionType[i]; 703 permission_info.type = kPermissionType[i];
704 704
705 if (!ShouldShowPermission(permission_info.type)) 705 if (!ShouldShowPermission(permission_info.type))
706 continue; 706 continue;
707 707
708 content_settings::SettingInfo info; 708 content_settings::SettingInfo info;
709 std::unique_ptr<base::Value> value = content_settings_->GetWebsiteSetting( 709 std::unique_ptr<base::Value> value = content_settings_->GetWebsiteSetting(
710 site_url_, site_url_, permission_info.type, std::string(), &info); 710 site_url_, site_url_, permission_info.type, std::string(), &info);
711 DCHECK(value.get()); 711 DCHECK(value.get());
712 if (value->GetType() == base::Value::TYPE_INTEGER) { 712 if (value->GetType() == base::Value::Type::INTEGER) {
713 permission_info.setting = 713 permission_info.setting =
714 content_settings::ValueToContentSetting(value.get()); 714 content_settings::ValueToContentSetting(value.get());
715 } else { 715 } else {
716 NOTREACHED(); 716 NOTREACHED();
717 } 717 }
718 718
719 permission_info.source = info.source; 719 permission_info.source = info.source;
720 permission_info.is_incognito = profile_->IsOffTheRecord(); 720 permission_info.is_incognito = profile_->IsOffTheRecord();
721 721
722 if (info.primary_pattern == ContentSettingsPattern::Wildcard() && 722 if (info.primary_pattern == ContentSettingsPattern::Wildcard() &&
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 info.connection_status = site_connection_status_; 791 info.connection_status = site_connection_status_;
792 info.connection_status_description = 792 info.connection_status_description =
793 UTF16ToUTF8(site_connection_details_); 793 UTF16ToUTF8(site_connection_details_);
794 info.identity_status = site_identity_status_; 794 info.identity_status = site_identity_status_;
795 info.identity_status_description = 795 info.identity_status_description =
796 UTF16ToUTF8(site_identity_details_); 796 UTF16ToUTF8(site_identity_details_);
797 info.certificate = certificate_; 797 info.certificate = certificate_;
798 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 798 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
799 ui_->SetIdentityInfo(info); 799 ui_->SetIdentityInfo(info);
800 } 800 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/applescript/apple_event_util.mm ('k') | chrome/browser/ui/webui/nacl_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698