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

Side by Side Diff: athena/main/athena_launcher.cc

Issue 305873002: InputManager/AcceleratorManager for athena (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix auto repeat test Created 6 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 | Annotate | Revision Log
« athena/input/public/input_manager.h ('K') | « athena/main/DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "athena/main/athena_launcher.h" 5 #include "athena/main/athena_launcher.h"
6 6
7 #include "athena/activity/public/activity_manager.h" 7 #include "athena/activity/public/activity_manager.h"
8 #include "athena/home/public/home_card.h" 8 #include "athena/home/public/home_card.h"
9 #include "athena/input/public/input_manager.h"
9 #include "athena/main/placeholder.h" 10 #include "athena/main/placeholder.h"
10 #include "athena/screen/public/screen_manager.h" 11 #include "athena/screen/public/screen_manager.h"
11 #include "athena/wm/public/window_manager.h" 12 #include "athena/wm/public/window_manager.h"
12 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
13 #include "ui/aura/window_property.h" 14 #include "ui/aura/window_property.h"
14 #include "ui/wm/core/visibility_controller.h" 15 #include "ui/wm/core/visibility_controller.h"
15 16
16 #if defined(USE_X11) 17 #if defined(USE_X11)
17 #include "ui/events/x/touch_factory_x11.h" 18 #include "ui/events/x/touch_factory_x11.h"
18 #endif 19 #endif
(...skipping 19 matching lines...) Expand all
38 #if defined(USE_X11) 39 #if defined(USE_X11)
39 ui::TouchFactory::SetTouchDeviceListFromCommandLine(); 40 ui::TouchFactory::SetTouchDeviceListFromCommandLine();
40 #endif 41 #endif
41 RootWindowState* root_window_state = new RootWindowState; 42 RootWindowState* root_window_state = new RootWindowState;
42 root_window->SetProperty(kRootWindowStateKey, root_window_state); 43 root_window->SetProperty(kRootWindowStateKey, root_window_state);
43 44
44 root_window_state->visibility_client.reset(new ::wm::VisibilityController); 45 root_window_state->visibility_client.reset(new ::wm::VisibilityController);
45 aura::client::SetVisibilityClient(root_window, 46 aura::client::SetVisibilityClient(root_window,
46 root_window_state->visibility_client.get()); 47 root_window_state->visibility_client.get());
47 48
49 athena::InputManager::Create()->OnRootWindowCreated(root_window);
48 athena::ScreenManager::Create(root_window); 50 athena::ScreenManager::Create(root_window);
49 athena::WindowManager::Create(); 51 athena::WindowManager::Create();
50 athena::HomeCard::Create(); 52 athena::HomeCard::Create();
51 athena::ActivityManager::Create(); 53 athena::ActivityManager::Create();
52 54
53 SetupBackgroundImage(); 55 SetupBackgroundImage();
54 } 56 }
55 57
56 void ShutdownAthena() { 58 void ShutdownAthena() {
57 athena::ActivityManager::Shutdown(); 59 athena::ActivityManager::Shutdown();
58 athena::HomeCard::Shutdown(); 60 athena::HomeCard::Shutdown();
59 athena::WindowManager::Shutdown(); 61 athena::WindowManager::Shutdown();
60 athena::ScreenManager::Shutdown(); 62 athena::ScreenManager::Shutdown();
63 athena::InputManager::Shutdown();
61 } 64 }
62 65
63 } // namespace athena 66 } // namespace athena
OLDNEW
« athena/input/public/input_manager.h ('K') | « athena/main/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698