Index: ui/message_center/views/message_center_bubble.cc |
diff --git a/ui/message_center/views/message_center_bubble.cc b/ui/message_center/views/message_center_bubble.cc |
index c65587b2537f1906159a3772a49b0ae6fc717bdc..0735f638db086cda8b38b26187647f40e9056951 100644 |
--- a/ui/message_center/views/message_center_bubble.cc |
+++ b/ui/message_center/views/message_center_bubble.cc |
@@ -107,10 +107,15 @@ void MessageCenterBubble::InitializeContents( |
// |new_bubble_view| actually wants. See crbug.com/169390. |
bubble_view()->Layout(); |
UpdateBubbleView(); |
- bubble_view() |
- ->GetFocusManager() |
- ->GetNextFocusableView(nullptr, nullptr, false, false) |
- ->RequestFocus(); |
+ views::FocusManager* focus_manager = new_bubble_view->GetFocusManager(); |
stevenjb
2016/07/11 18:25:10
Since we are using bubble_view() above we should u
yoshiki
2016/07/12 03:43:43
Done.
|
+ // new_bubble_view should be a top level view and have a focus manager. |
+ DCHECK(focus_manager); |
+ views::View* next_focusable_view = focus_manager |
+ ->GetNextFocusableView(nullptr, nullptr, false, false); |
+ // The bubble may not have any focusable view (eg. on lock screen). In such |
+ // case, |next_focusable_view| is null. |
+ if (next_focusable_view) |
+ next_focusable_view->RequestFocus(); |
} |
void MessageCenterBubble::OnBubbleViewDestroyed() { |