OLD | NEW |
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 <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 WebsiteSettingsUI::PermissionInfo permission_info; | 419 WebsiteSettingsUI::PermissionInfo permission_info; |
420 for (size_t i = 0; i < arraysize(kPermissionType); ++i) { | 420 for (size_t i = 0; i < arraysize(kPermissionType); ++i) { |
421 permission_info.type = kPermissionType[i]; | 421 permission_info.type = kPermissionType[i]; |
422 | 422 |
423 content_settings::SettingInfo info; | 423 content_settings::SettingInfo info; |
424 scoped_ptr<Value> value(content_settings_->GetWebsiteSetting( | 424 scoped_ptr<Value> value(content_settings_->GetWebsiteSetting( |
425 site_url_, site_url_, permission_info.type, "", &info)); | 425 site_url_, site_url_, permission_info.type, "", &info)); |
426 DCHECK(value.get()); | 426 DCHECK(value.get()); |
427 permission_info.setting = | 427 permission_info.setting = |
428 content_settings::ValueToContentSetting(value.get()); | 428 content_settings::ValueToContentSetting(value.get()); |
| 429 permission_info.source = info.source; |
429 | 430 |
430 if (info.primary_pattern == ContentSettingsPattern::Wildcard() && | 431 if (info.primary_pattern == ContentSettingsPattern::Wildcard() && |
431 info.secondary_pattern == ContentSettingsPattern::Wildcard()) { | 432 info.secondary_pattern == ContentSettingsPattern::Wildcard()) { |
432 permission_info.default_setting = permission_info.setting; | 433 permission_info.default_setting = permission_info.setting; |
433 permission_info.setting = CONTENT_SETTING_DEFAULT; | 434 permission_info.setting = CONTENT_SETTING_DEFAULT; |
434 } else { | 435 } else { |
435 permission_info.default_setting = | 436 permission_info.default_setting = |
436 content_settings_->GetDefaultContentSetting(permission_info.type, | 437 content_settings_->GetDefaultContentSetting(permission_info.type, |
437 NULL); | 438 NULL); |
438 } | 439 } |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
507 first_visit_text = l10n_util::GetStringFUTF16( | 508 first_visit_text = l10n_util::GetStringFUTF16( |
508 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, | 509 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, |
509 base::TimeFormatShortDate(first_visit)); | 510 base::TimeFormatShortDate(first_visit)); |
510 } else { | 511 } else { |
511 first_visit_text = l10n_util::GetStringUTF16( | 512 first_visit_text = l10n_util::GetStringUTF16( |
512 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); | 513 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); |
513 | 514 |
514 } | 515 } |
515 ui_->SetFirstVisit(first_visit_text); | 516 ui_->SetFirstVisit(first_visit_text); |
516 } | 517 } |
OLD | NEW |