| 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 "ash/common/system/status_area_widget_delegate.h" | 5 #include "ash/common/system/status_area_widget_delegate.h" |
| 6 | 6 |
| 7 #include "ash/ash_export.h" | 7 #include "ash/ash_export.h" |
| 8 #include "ash/common/focus_cycler.h" | 8 #include "ash/common/focus_cycler.h" |
| 9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
| 10 #include "ash/common/shelf/shelf_constants.h" | 10 #include "ash/common/shelf/shelf_constants.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 } | 62 } |
| 63 | 63 |
| 64 StatusAreaWidgetDelegate::~StatusAreaWidgetDelegate() {} | 64 StatusAreaWidgetDelegate::~StatusAreaWidgetDelegate() {} |
| 65 | 65 |
| 66 void StatusAreaWidgetDelegate::SetFocusCyclerForTesting( | 66 void StatusAreaWidgetDelegate::SetFocusCyclerForTesting( |
| 67 const FocusCycler* focus_cycler) { | 67 const FocusCycler* focus_cycler) { |
| 68 focus_cycler_for_testing_ = focus_cycler; | 68 focus_cycler_for_testing_ = focus_cycler; |
| 69 } | 69 } |
| 70 | 70 |
| 71 views::View* StatusAreaWidgetDelegate::GetDefaultFocusableChild() { | 71 views::View* StatusAreaWidgetDelegate::GetDefaultFocusableChild() { |
| 72 return default_last_focusable_child_ ? GetLastFocusableChild() | 72 return child_at(0); |
| 73 : GetFirstFocusableChild(); | |
| 74 } | |
| 75 | |
| 76 views::FocusSearch* StatusAreaWidgetDelegate::GetFocusSearch() { | |
| 77 return custom_focus_traversable_ ? custom_focus_traversable_->GetFocusSearch() | |
| 78 : AccessiblePaneView::GetFocusSearch(); | |
| 79 } | |
| 80 | |
| 81 views::FocusTraversable* StatusAreaWidgetDelegate::GetFocusTraversableParent() { | |
| 82 return custom_focus_traversable_ | |
| 83 ? custom_focus_traversable_->GetFocusTraversableParent() | |
| 84 : AccessiblePaneView::GetFocusTraversableParent(); | |
| 85 } | |
| 86 | |
| 87 views::View* StatusAreaWidgetDelegate::GetFocusTraversableParentView() { | |
| 88 return custom_focus_traversable_ | |
| 89 ? custom_focus_traversable_->GetFocusTraversableParentView() | |
| 90 : AccessiblePaneView::GetFocusTraversableParentView(); | |
| 91 } | 73 } |
| 92 | 74 |
| 93 views::Widget* StatusAreaWidgetDelegate::GetWidget() { | 75 views::Widget* StatusAreaWidgetDelegate::GetWidget() { |
| 94 return View::GetWidget(); | 76 return View::GetWidget(); |
| 95 } | 77 } |
| 96 | 78 |
| 97 const views::Widget* StatusAreaWidgetDelegate::GetWidget() const { | 79 const views::Widget* StatusAreaWidgetDelegate::GetWidget() const { |
| 98 return View::GetWidget(); | 80 return View::GetWidget(); |
| 99 } | 81 } |
| 100 | 82 |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 } | 230 } |
| 249 child->SetBorder( | 231 child->SetBorder( |
| 250 views::CreateEmptyBorder(top_edge, left_edge, bottom_edge, right_edge)); | 232 views::CreateEmptyBorder(top_edge, left_edge, bottom_edge, right_edge)); |
| 251 // Layout on |child| needs to be updated based on new border value before | 233 // Layout on |child| needs to be updated based on new border value before |
| 252 // displaying; otherwise |child| will be showing with old border size. | 234 // displaying; otherwise |child| will be showing with old border size. |
| 253 // Fix for crbug.com/623438. | 235 // Fix for crbug.com/623438. |
| 254 child->Layout(); | 236 child->Layout(); |
| 255 } | 237 } |
| 256 | 238 |
| 257 } // namespace ash | 239 } // namespace ash |
| OLD | NEW |