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

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

Issue 475533008: Revert of Rotate screen in response to accelerator or device orientation sensors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
« no previous file with comments | « athena/athena.gyp ('k') | athena/screen/public/screen_manager.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 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/input/public/input_manager.h"
11 #include "athena/main/placeholder.h" 11 #include "athena/main/placeholder.h"
12 #include "athena/screen/public/screen_manager.h" 12 #include "athena/screen/public/screen_manager.h"
13 #include "athena/system/public/system_ui.h" 13 #include "athena/system/public/system_ui.h"
14 #include "athena/wm/public/window_manager.h" 14 #include "athena/wm/public/window_manager.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "content/public/browser/browser_thread.h"
17 #include "ui/aura/window_property.h" 16 #include "ui/aura/window_property.h"
18 #include "ui/views/views_delegate.h" 17 #include "ui/views/views_delegate.h"
19 #include "ui/wm/core/visibility_controller.h" 18 #include "ui/wm/core/visibility_controller.h"
20 19
21 #if defined(USE_X11) 20 #if defined(USE_X11)
22 #include "ui/events/x/touch_factory_x11.h" 21 #include "ui/events/x/touch_factory_x11.h"
23 #endif 22 #endif
24 23
25 namespace athena { 24 namespace athena {
26 struct RootWindowState; 25 struct RootWindowState;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 62
64 views::ViewsDelegate::views_delegate = new AthenaViewsDelegate(); 63 views::ViewsDelegate::views_delegate = new AthenaViewsDelegate();
65 64
66 RootWindowState* root_window_state = new RootWindowState; 65 RootWindowState* root_window_state = new RootWindowState;
67 root_window->SetProperty(kRootWindowStateKey, root_window_state); 66 root_window->SetProperty(kRootWindowStateKey, root_window_state);
68 67
69 root_window_state->visibility_client.reset(new ::wm::VisibilityController); 68 root_window_state->visibility_client.reset(new ::wm::VisibilityController);
70 aura::client::SetVisibilityClient(root_window, 69 aura::client::SetVisibilityClient(root_window,
71 root_window_state->visibility_client.get()); 70 root_window_state->visibility_client.get());
72 71
73 athena::SystemUI::Create( 72 athena::SystemUI::Create();
74 content::BrowserThread::GetMessageLoopProxyForThread(
75 content::BrowserThread::FILE));
76 athena::InputManager::Create()->OnRootWindowCreated(root_window); 73 athena::InputManager::Create()->OnRootWindowCreated(root_window);
77 athena::ScreenManager::Create(root_window); 74 athena::ScreenManager::Create(root_window);
78 athena::WindowManager::Create(); 75 athena::WindowManager::Create();
79 athena::HomeCard::Create(app_model_builder); 76 athena::HomeCard::Create(app_model_builder);
80 athena::ActivityManager::Create(); 77 athena::ActivityManager::Create();
81 athena::ActivityFactory::RegisterActivityFactory(activity_factory); 78 athena::ActivityFactory::RegisterActivityFactory(activity_factory);
82 SetupBackgroundImage(); 79 SetupBackgroundImage();
83 } 80 }
84 81
85 void ShutdownAthena() { 82 void ShutdownAthena() {
86 athena::ActivityFactory::Shutdown(); 83 athena::ActivityFactory::Shutdown();
87 athena::ActivityManager::Shutdown(); 84 athena::ActivityManager::Shutdown();
88 athena::HomeCard::Shutdown(); 85 athena::HomeCard::Shutdown();
89 athena::WindowManager::Shutdown(); 86 athena::WindowManager::Shutdown();
90 athena::ScreenManager::Shutdown(); 87 athena::ScreenManager::Shutdown();
91 athena::InputManager::Shutdown(); 88 athena::InputManager::Shutdown();
92 athena::SystemUI::Shutdown(); 89 athena::SystemUI::Shutdown();
93 90
94 delete views::ViewsDelegate::views_delegate; 91 delete views::ViewsDelegate::views_delegate;
95 } 92 }
96 93
97 } // namespace athena 94 } // namespace athena
OLDNEW
« no previous file with comments | « athena/athena.gyp ('k') | athena/screen/public/screen_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698