Index: chrome/browser/chromeos/accessibility/chromevox_panel.cc |
diff --git a/chrome/browser/chromeos/accessibility/chromevox_panel.cc b/chrome/browser/chromeos/accessibility/chromevox_panel.cc |
index e716e66d4184013672d32e8f560ecbeea0ddd3b9..12fb0fa0ebcf590a9d1fed0da439e1df5226fb17 100644 |
--- a/chrome/browser/chromeos/accessibility/chromevox_panel.cc |
+++ b/chrome/browser/chromeos/accessibility/chromevox_panel.cc |
@@ -109,9 +109,14 @@ void ChromeVoxPanel::Close() { |
void ChromeVoxPanel::DidFirstVisuallyNonEmptyPaint() { |
widget_->Show(); |
- ash::Shelf::ForWindow(GetRootWindow()) |
- ->shelf_layout_manager() |
- ->SetChromeVoxPanelHeight(kPanelHeight); |
+ |
+ ash::Shelf* shelf = ash::Shelf::ForWindow(GetRootWindow()); |
+ if (!shelf) |
+ return; |
+ |
+ ash::ShelfLayoutManager* shelf_layout_manager = shelf->shelf_layout_manager(); |
+ if (shelf_layout_manager) |
+ shelf_layout_manager->SetChromeVoxPanelHeight(kPanelHeight); |
xiyuan
2016/03/28 21:48:05
Do we need to worry about shelf not getting the co
dmazzoni
2016/03/28 22:29:11
Good catch, fixed.
|
} |
void ChromeVoxPanel::EnterFullscreen() { |