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_ui.h" | 5 #include "chrome/browser/ui/website_settings/website_settings_ui.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "chrome/grit/chromium_strings.h" | 8 #include "chrome/grit/chromium_strings.h" |
9 #include "chrome/grit/generated_resources.h" | 9 #include "chrome/grit/generated_resources.h" |
10 #include "components/content_settings/core/browser/plugins_field_trial.h" | 10 #include "components/content_settings/core/browser/plugins_field_trial.h" |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 | 123 |
124 WebsiteSettingsUI::PermissionInfo::PermissionInfo() | 124 WebsiteSettingsUI::PermissionInfo::PermissionInfo() |
125 : type(CONTENT_SETTINGS_TYPE_DEFAULT), | 125 : type(CONTENT_SETTINGS_TYPE_DEFAULT), |
126 setting(CONTENT_SETTING_DEFAULT), | 126 setting(CONTENT_SETTING_DEFAULT), |
127 default_setting(CONTENT_SETTING_DEFAULT), | 127 default_setting(CONTENT_SETTING_DEFAULT), |
128 source(content_settings::SETTING_SOURCE_NONE), | 128 source(content_settings::SETTING_SOURCE_NONE), |
129 is_incognito(false) {} | 129 is_incognito(false) {} |
130 | 130 |
131 WebsiteSettingsUI::ChosenObjectInfo::ChosenObjectInfo( | 131 WebsiteSettingsUI::ChosenObjectInfo::ChosenObjectInfo( |
132 const WebsiteSettings::ChooserUIInfo& ui_info, | 132 const WebsiteSettings::ChooserUIInfo& ui_info, |
133 scoped_ptr<base::DictionaryValue> object) | 133 std::unique_ptr<base::DictionaryValue> object) |
134 : ui_info(ui_info), object(std::move(object)) {} | 134 : ui_info(ui_info), object(std::move(object)) {} |
135 | 135 |
136 WebsiteSettingsUI::ChosenObjectInfo::~ChosenObjectInfo() {} | 136 WebsiteSettingsUI::ChosenObjectInfo::~ChosenObjectInfo() {} |
137 | 137 |
138 WebsiteSettingsUI::IdentityInfo::IdentityInfo() | 138 WebsiteSettingsUI::IdentityInfo::IdentityInfo() |
139 : identity_status(WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN), | 139 : identity_status(WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN), |
140 cert_id(0), | 140 cert_id(0), |
141 connection_status(WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN), | 141 connection_status(WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN), |
142 show_ssl_decision_revoke_button(false) { | 142 show_ssl_decision_revoke_button(false) { |
143 } | 143 } |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 } | 362 } |
363 return resource_id; | 363 return resource_id; |
364 } | 364 } |
365 | 365 |
366 // static | 366 // static |
367 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( | 367 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( |
368 WebsiteSettings::SiteConnectionStatus status) { | 368 WebsiteSettings::SiteConnectionStatus status) { |
369 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 369 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
370 return rb.GetNativeImageNamed(GetConnectionIconID(status)); | 370 return rb.GetNativeImageNamed(GetConnectionIconID(status)); |
371 } | 371 } |
OLD | NEW |