chrome/browser/chromeos/accessibility/accessibility_manager.cc - Issue 2237903003: mash: Migrate Shelf aura::Window uses to WmWindow.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2237903003: mash: Migrate Shelf aura::Window uses to WmWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move shelf notify functions to WmShell. Created 4 years, 4 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:

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 8dee33378a3c86e0d7c1713a8b918fa7281fa7aa..9039d729aa36004dc2703c1e26cef0d8a31ff4f0 100644

--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc

+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc

@@ -10,6 +10,7 @@

#include <memory>

#include <utility>

+#include "ash/aura/wm_window_aura.h"

#include "ash/autoclick/autoclick_controller.h"

#include "ash/common/session/session_state_delegate.h"

#include "ash/common/wm_shell.h"

@@ -1522,7 +1523,8 @@ void AccessibilityManager::OnChromeVoxPanelClosing() {

chromevox_panel_widget_observer_.reset(nullptr);

chromevox_panel_ = nullptr;

- ash::Shelf* shelf = ash::Shelf::ForWindow(root_window);

+ ash::Shelf* shelf =

+ ash::Shelf::ForWindow(ash::WmWindowAura::Get(root_window));

if (!shelf)

return;