Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Unified Diff: chrome/browser/chromeos/accessibility/accessibility_manager.cc

Issue 2889673002: chromeos: Refactor shelf to create ShelfView earlier in startup (Closed)
Patch Set: rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index 954dcef2caac2ba5d1c317430caa0da04b6b89f1..c0c781f667dc5c59e8495b6996aa27d408509517 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -1512,18 +1512,9 @@ void AccessibilityManager::ReloadChromeVoxPanel() {
}
void AccessibilityManager::OnChromeVoxPanelClosing() {
- aura::Window* root_window = chromevox_panel_->GetRootWindow();
- chromevox_panel_widget_observer_.reset(nullptr);
+ chromevox_panel_->ResetPanelHeight();
+ chromevox_panel_widget_observer_.reset();
chromevox_panel_ = nullptr;
-
- ash::WmShelf* shelf =
- ash::WmShelf::ForWindow(ash::WmWindow::Get(root_window));
- if (!shelf->IsShelfInitialized())
- return;
-
- ash::ShelfLayoutManager* shelf_layout_manager = shelf->shelf_layout_manager();
- if (shelf_layout_manager)
- shelf_layout_manager->SetChromeVoxPanelHeight(0);
}
void AccessibilityManager::OnChromeVoxPanelDestroying() {

Powered by Google App Engine
This is Rietveld 408576698