athena/main/athena_launcher.cc - Issue 305873002: InputManager/AcceleratorManager for athena

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: rebase 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

OLD	NEW
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_factory.h"	7 #include "athena/activity/public/activity_factory.h"

8 #include "athena/activity/public/activity_manager.h"	8 #include "athena/activity/public/activity_manager.h"

9 #include "athena/home/public/home_card.h"	9 #include "athena/home/public/home_card.h"

	10 #include "athena/input/public/input_manager.h"

10 #include "athena/main/placeholder.h"	11 #include "athena/main/placeholder.h"

11 #include "athena/screen/public/screen_manager.h"	12 #include "athena/screen/public/screen_manager.h"

12 #include "athena/wm/public/window_manager.h"	13 #include "athena/wm/public/window_manager.h"

13 #include "base/memory/scoped_ptr.h"	14 #include "base/memory/scoped_ptr.h"

14 #include "ui/aura/window_property.h"	15 #include "ui/aura/window_property.h"

15 #include "ui/wm/core/visibility_controller.h"	16 #include "ui/wm/core/visibility_controller.h"

16	17

17 #if defined(USE_X11)	18 #if defined(USE_X11)

18 #include "ui/events/x/touch_factory_x11.h"	19 #include "ui/events/x/touch_factory_x11.h"

19 #endif	20 #endif

(...skipping 20 matching lines...) Expand all Loading...
40 #if defined(USE_X11)	41 #if defined(USE_X11)

41 ui::TouchFactory::SetTouchDeviceListFromCommandLine();	42 ui::TouchFactory::SetTouchDeviceListFromCommandLine();

42 #endif	43 #endif

43 RootWindowState* root_window_state = new RootWindowState;	44 RootWindowState* root_window_state = new RootWindowState;

44 root_window->SetProperty(kRootWindowStateKey, root_window_state);	45 root_window->SetProperty(kRootWindowStateKey, root_window_state);

45	46

46 root_window_state->visibility_client.reset(new ::wm::VisibilityController);	47 root_window_state->visibility_client.reset(new ::wm::VisibilityController);

47 aura::client::SetVisibilityClient(root_window,	48 aura::client::SetVisibilityClient(root_window,

48 root_window_state->visibility_client.get());	49 root_window_state->visibility_client.get());

49	50

	51 athena::InputManager::Create()->OnRootWindowCreated(root_window);

50 athena::ScreenManager::Create(root_window);	52 athena::ScreenManager::Create(root_window);

51 athena::WindowManager::Create();	53 athena::WindowManager::Create();

52 athena::HomeCard::Create();	54 athena::HomeCard::Create();

53 athena::ActivityManager::Create();	55 athena::ActivityManager::Create();

54 athena::ActivityFactory::RegisterActivityFactory(activity_factory);	56 athena::ActivityFactory::RegisterActivityFactory(activity_factory);

55 SetupBackgroundImage();	57 SetupBackgroundImage();

56 }	58 }

57	59

58 void ShutdownAthena() {	60 void ShutdownAthena() {

59 athena::ActivityFactory::Shutdown();	61 athena::ActivityFactory::Shutdown();

60 athena::ActivityManager::Shutdown();	62 athena::ActivityManager::Shutdown();

61 athena::HomeCard::Shutdown();	63 athena::HomeCard::Shutdown();

62 athena::WindowManager::Shutdown();	64 athena::WindowManager::Shutdown();

63 athena::ScreenManager::Shutdown();	65 athena::ScreenManager::Shutdown();

	66 athena::InputManager::Shutdown();

64 }	67 }

65	68

66 } // namespace athena	69 } // namespace athena

OLD	NEW

« no previous file with comments | « athena/main/DEPS ('k') | no next file » | no next file with comments »