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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2086143002: Convert TrayEventFilter to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak 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 unified diff | Download patch
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/shell.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/mus/bridge/wm_shell_mus.h" 5 #include "ash/mus/bridge/wm_shell_mus.h"
6 6
7 #include "ash/common/default_accessibility_delegate.h" 7 #include "ash/common/default_accessibility_delegate.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/shell_observer.h" 9 #include "ash/common/shell_observer.h"
10 #include "ash/common/shell_window_ids.h" 10 #include "ash/common/shell_window_ids.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 } 267 }
268 268
269 void WmShellMus::AddShellObserver(ShellObserver* observer) { 269 void WmShellMus::AddShellObserver(ShellObserver* observer) {
270 wm_shell_common_->AddShellObserver(observer); 270 wm_shell_common_->AddShellObserver(observer);
271 } 271 }
272 272
273 void WmShellMus::RemoveShellObserver(ShellObserver* observer) { 273 void WmShellMus::RemoveShellObserver(ShellObserver* observer) {
274 wm_shell_common_->RemoveShellObserver(observer); 274 wm_shell_common_->RemoveShellObserver(observer);
275 } 275 }
276 276
277 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher) {
278 // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here.
279 NOTIMPLEMENTED();
280 }
281
282 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
283 NOTIMPLEMENTED();
284 }
285
286 #if defined(OS_CHROMEOS)
287 void WmShellMus::ToggleIgnoreExternalKeyboard() {
288 NOTIMPLEMENTED();
289 }
290 #endif // defined(OS_CHROMEOS)
291
277 // static 292 // static
278 bool WmShellMus::IsActivationParent(::mus::Window* window) { 293 bool WmShellMus::IsActivationParent(::mus::Window* window) {
279 return window && IsActivatableShellWindowId( 294 return window && IsActivatableShellWindowId(
280 WmWindowMus::Get(window)->GetShellWindowId()); 295 WmWindowMus::Get(window)->GetShellWindowId());
281 } 296 }
282 297
283 void WmShellMus::RemoveClientObserver() { 298 void WmShellMus::RemoveClientObserver() {
284 if (!client_) 299 if (!client_)
285 return; 300 return;
286 301
(...skipping 11 matching lines...) Expand all
298 313
299 FOR_EACH_OBSERVER(WmActivationObserver, activation_observers_, 314 FOR_EACH_OBSERVER(WmActivationObserver, activation_observers_,
300 OnWindowActivated(gained_active, lost_active)); 315 OnWindowActivated(gained_active, lost_active));
301 } 316 }
302 317
303 void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) { 318 void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) {
304 DCHECK_EQ(client, client_); 319 DCHECK_EQ(client, client_);
305 RemoveClientObserver(); 320 RemoveClientObserver();
306 } 321 }
307 322
308 #if defined(OS_CHROMEOS)
309 void WmShellMus::ToggleIgnoreExternalKeyboard() {
310 NOTIMPLEMENTED();
311 }
312 #endif // defined(OS_CHROMEOS)
313
314 } // namespace mus 323 } // namespace mus
315 } // namespace ash 324 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698