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

Side by Side Diff: ash/wm/event_client_impl.cc

Issue 11314013: Register a separate default ui::EventTarget for Aura (Ash) to ensure that it does not interfere wit… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ash/wm/event_client_impl.h ('k') | ui/aura/client/event_client.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/wm/event_client_impl.h" 5 #include "ash/wm/event_client_impl.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 10
(...skipping 20 matching lines...) Expand all
31 const aura::Window* lock_screen_related_containers = Shell::GetContainer( 31 const aura::Window* lock_screen_related_containers = Shell::GetContainer(
32 root_window, 32 root_window,
33 kShellWindowId_LockScreenRelatedContainersContainer); 33 kShellWindowId_LockScreenRelatedContainersContainer);
34 return lock_screen_containers->Contains(window) || 34 return lock_screen_containers->Contains(window) ||
35 lock_background_containers->Contains(window) || 35 lock_background_containers->Contains(window) ||
36 lock_screen_related_containers->Contains(window); 36 lock_screen_related_containers->Contains(window);
37 } 37 }
38 return true; 38 return true;
39 } 39 }
40 40
41 ui::EventTarget* EventClientImpl::GetToplevelEventTarget() {
42 return Shell::GetInstance();
43 }
44
41 } // namespace internal 45 } // namespace internal
42 } // namespace ash 46 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/event_client_impl.h ('k') | ui/aura/client/event_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698