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

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

Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
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/session/session_state_delegate.h" 7 #include "ash/session_state_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 #include "ui/keyboard/keyboard_util.h" 11 #include "ui/keyboard/keyboard_util.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 EventClientImpl::EventClientImpl() { 15 EventClientImpl::EventClientImpl() {
16 } 16 }
17 17
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 virtual_keyboard_container->Contains(window)); 49 virtual_keyboard_container->Contains(window));
50 } 50 }
51 return can_process_events; 51 return can_process_events;
52 } 52 }
53 53
54 ui::EventTarget* EventClientImpl::GetToplevelEventTarget() { 54 ui::EventTarget* EventClientImpl::GetToplevelEventTarget() {
55 return Shell::GetInstance(); 55 return Shell::GetInstance();
56 } 56 }
57 57
58 } // namespace ash 58 } // namespace ash
OLDNEW
« no previous file with comments | « trunk/src/ash/test/test_system_tray_delegate.cc ('k') | trunk/src/ash/wm/gestures/shelf_gesture_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698