| 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_row.h" | 5 #include "chrome/browser/ui/views/page_info/permission_selector_row.h" |
| 6 | 6 |
| 7 #include "base/i18n/rtl.h" | 7 #include "base/i18n/rtl.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/ui/page_info/permission_menu_model.h" | 10 #include "chrome/browser/ui/page_info/permission_menu_model.h" |
| 11 #include "chrome/browser/ui/page_info/website_settings_ui.h" | 11 #include "chrome/browser/ui/page_info/website_settings_ui.h" |
| 12 #include "chrome/browser/ui/views/website_settings/non_accessible_image_view.h" | 12 #include "chrome/browser/ui/views/page_info/non_accessible_image_view.h" |
| 13 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" | 13 #include "chrome/browser/ui/views/page_info/website_settings_popup_view.h" |
| 14 #include "chrome/grit/generated_resources.h" | 14 #include "chrome/grit/generated_resources.h" |
| 15 #include "ui/accessibility/ax_node_data.h" | 15 #include "ui/accessibility/ax_node_data.h" |
| 16 #include "ui/base/material_design/material_design_controller.h" | 16 #include "ui/base/material_design/material_design_controller.h" |
| 17 #include "ui/base/models/combobox_model.h" | 17 #include "ui/base/models/combobox_model.h" |
| 18 #include "ui/gfx/image/image.h" | 18 #include "ui/gfx/image/image.h" |
| 19 #include "ui/views/controls/button/menu_button.h" | 19 #include "ui/views/controls/button/menu_button.h" |
| 20 #include "ui/views/controls/combobox/combobox.h" | 20 #include "ui/views/controls/combobox/combobox.h" |
| 21 #include "ui/views/controls/combobox/combobox_listener.h" | 21 #include "ui/views/controls/combobox/combobox_listener.h" |
| 22 #include "ui/views/controls/image_view.h" | 22 #include "ui/views/controls/image_view.h" |
| 23 #include "ui/views/controls/label.h" | 23 #include "ui/views/controls/label.h" |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 observer.OnPermissionChanged(permission); | 342 observer.OnPermissionChanged(permission); |
| 343 } | 343 } |
| 344 | 344 |
| 345 views::View* PermissionSelectorRow::button() { | 345 views::View* PermissionSelectorRow::button() { |
| 346 // These casts are required because the two arms of a ?: cannot have different | 346 // These casts are required because the two arms of a ?: cannot have different |
| 347 // types T1 and T2, even if the resulting value of the ?: is about to be a T | 347 // types T1 and T2, even if the resulting value of the ?: is about to be a T |
| 348 // and T1 and T2 are both subtypes of T. | 348 // and T1 and T2 are both subtypes of T. |
| 349 return menu_button_ ? static_cast<views::View*>(menu_button_) | 349 return menu_button_ ? static_cast<views::View*>(menu_button_) |
| 350 : static_cast<views::View*>(combobox_); | 350 : static_cast<views::View*>(combobox_); |
| 351 } | 351 } |
| OLD | NEW |