| 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/views/website_settings/permission_selector_view.h" | 5 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/ui/website_settings/permission_menu_model.h" | 8 #include "chrome/browser/ui/website_settings/permission_menu_model.h" |
| 9 #include "chrome/browser/ui/website_settings/website_settings_ui.h" | 9 #include "chrome/browser/ui/website_settings/website_settings_ui.h" |
| 10 #include "chrome/grit/generated_resources.h" | 10 #include "chrome/grit/generated_resources.h" |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 menu_model_.reset(new PermissionMenuModel( | 169 menu_model_.reset(new PermissionMenuModel( |
| 170 url, | 170 url, |
| 171 permission, | 171 permission, |
| 172 base::Bind(&PermissionSelectorView::PermissionChanged, | 172 base::Bind(&PermissionSelectorView::PermissionChanged, |
| 173 base::Unretained(this)))); | 173 base::Unretained(this)))); |
| 174 // Create the permission menu button. | 174 // Create the permission menu button. |
| 175 bool button_enabled = | 175 bool button_enabled = |
| 176 permission.source == content_settings::SETTING_SOURCE_USER; | 176 permission.source == content_settings::SETTING_SOURCE_USER; |
| 177 menu_button_ = new internal::PermissionMenuButton( | 177 menu_button_ = new internal::PermissionMenuButton( |
| 178 WebsiteSettingsUI::PermissionActionToUIString( | 178 WebsiteSettingsUI::PermissionActionToUIString( |
| 179 permission.setting, permission.default_setting, permission.source), | 179 permission.type, permission.setting, permission.default_setting, |
| 180 menu_model_.get(), | 180 permission.source), |
| 181 button_enabled); | 181 menu_model_.get(), button_enabled); |
| 182 menu_button_->SetEnabled(button_enabled); | 182 menu_button_->SetEnabled(button_enabled); |
| 183 menu_button_->SetFocusable(button_enabled); | 183 menu_button_->SetFocusable(button_enabled); |
| 184 menu_button_->SetAccessibleName( | 184 menu_button_->SetAccessibleName( |
| 185 WebsiteSettingsUI::PermissionTypeToUIString(permission.type)); | 185 WebsiteSettingsUI::PermissionTypeToUIString(permission.type)); |
| 186 layout->AddView(menu_button_); | 186 layout->AddView(menu_button_); |
| 187 } | 187 } |
| 188 | 188 |
| 189 void PermissionSelectorView::AddObserver( | 189 void PermissionSelectorView::AddObserver( |
| 190 PermissionSelectorViewObserver* observer) { | 190 PermissionSelectorViewObserver* observer) { |
| 191 observer_list_.AddObserver(observer); | 191 observer_list_.AddObserver(observer); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 204 } | 204 } |
| 205 | 205 |
| 206 void PermissionSelectorView::PermissionChanged( | 206 void PermissionSelectorView::PermissionChanged( |
| 207 const WebsiteSettingsUI::PermissionInfo& permission) { | 207 const WebsiteSettingsUI::PermissionInfo& permission) { |
| 208 // Change the permission icon to reflect the selected setting. | 208 // Change the permission icon to reflect the selected setting. |
| 209 const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(permission); | 209 const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(permission); |
| 210 icon_->SetImage(image.ToImageSkia()); | 210 icon_->SetImage(image.ToImageSkia()); |
| 211 | 211 |
| 212 // Update the menu button text to reflect the new setting. | 212 // Update the menu button text to reflect the new setting. |
| 213 menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString( | 213 menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString( |
| 214 permission.setting, | 214 permission.type, permission.setting, permission.default_setting, |
| 215 permission.default_setting, | |
| 216 content_settings::SETTING_SOURCE_USER)); | 215 content_settings::SETTING_SOURCE_USER)); |
| 217 | 216 |
| 218 FOR_EACH_OBSERVER(PermissionSelectorViewObserver, | 217 FOR_EACH_OBSERVER(PermissionSelectorViewObserver, |
| 219 observer_list_, | 218 observer_list_, |
| 220 OnPermissionChanged(permission)); | 219 OnPermissionChanged(permission)); |
| 221 } | 220 } |
| OLD | NEW |