diff options
Diffstat (limited to 'views/controls/button')
-rw-r--r-- | views/controls/button/menu_button.cc | 3 | ||||
-rw-r--r-- | views/controls/button/radio_button.cc | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 353205d..0e5d702 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -100,7 +100,8 @@ bool MenuButton::Activate() { // matter where the user pressed. To force RootView to recalculate the // mouse target during the mouse press we explicitly set the mouse handler // to NULL. - GetRootView()->SetMouseHandler(NULL); + static_cast<internal::RootView*>(GetWidget()->GetRootView())-> + SetMouseHandler(NULL); menu_visible_ = true; diff --git a/views/controls/button/radio_button.cc b/views/controls/button/radio_button.cc index a5292eb..249cba2 100644 --- a/views/controls/button/radio_button.cc +++ b/views/controls/button/radio_button.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "views/widget/root_view.h" +#include "views/widget/widget.h" namespace views { @@ -71,7 +71,7 @@ void RadioButton::GetAccessibleState(ui::AccessibleViewState* state) { View* RadioButton::GetSelectedViewForGroup(int group_id) { std::vector<View*> views; - GetRootView()->GetViewsWithGroup(group_id, &views); + GetWidget()->GetRootView()->GetViewsWithGroup(group_id, &views); if (views.empty()) return NULL; @@ -170,7 +170,7 @@ void RadioButtonNt::GetAccessibleState(ui::AccessibleViewState* state) { View* RadioButtonNt::GetSelectedViewForGroup(int group_id) { std::vector<View*> views; - GetRootView()->GetViewsWithGroup(group_id, &views); + GetWidget()->GetRootView()->GetViewsWithGroup(group_id, &views); if (views.empty()) return NULL; |