ash/ash_touch_exploration_manager_chromeos.cc - Issue 2098023002: mash: Migrate remaining tray observers and notify functions.

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: ash/ash_touch_exploration_manager_chromeos.cc

Issue 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. Created 4 years, 6 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: ash/ash_touch_exploration_manager_chromeos.cc

diff --git a/ash/ash_touch_exploration_manager_chromeos.cc b/ash/ash_touch_exploration_manager_chromeos.cc

index 998676064de23226f3b8f89832bbce14ed3d81b5..6900b2709dd3bb3fc844b95d214762e848e84bb1 100644

--- a/ash/ash_touch_exploration_manager_chromeos.cc

+++ b/ash/ash_touch_exploration_manager_chromeos.cc

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

#include "ash/audio/sounds.h"

#include "ash/common/accessibility_delegate.h"

-#include "ash/common/system/tray/wm_system_tray_notifier.h"

+#include "ash/common/system/tray/system_tray_notifier.h"

#include "ash/common/wm_shell.h"

#include "ash/root_window_controller.h"

#include "ash/shell.h"

@@ -30,7 +30,7 @@ AshTouchExplorationManager::AshTouchExplorationManager(

}

AshTouchExplorationManager::~AshTouchExplorationManager() {

- WmSystemTrayNotifier* system_tray_notifier =

+ SystemTrayNotifier* system_tray_notifier =

WmShell::Get()->system_tray_notifier();

if (system_tray_notifier)

system_tray_notifier->RemoveAccessibilityObserver(this);

« no previous file with comments | « ash/ash.gyp ('k') | ash/common/keyboard/keyboard_ui.cc » ('j') | ash/shell.h » ('J')