| 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/public/athena_launcher.h" | 5 #include "athena/main/public/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/content/public/app_registry.h" | 9 #include "athena/content/public/app_registry.h" |
| 10 #include "athena/content/public/content_activity_factory_creator.h" | 10 #include "athena/content/public/content_activity_factory_creator.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 public: | 70 public: |
| 71 VirtualKeyboardObserver() { | 71 VirtualKeyboardObserver() { |
| 72 keyboard::KeyboardController::GetInstance()->AddObserver(this); | 72 keyboard::KeyboardController::GetInstance()->AddObserver(this); |
| 73 } | 73 } |
| 74 | 74 |
| 75 virtual ~VirtualKeyboardObserver() { | 75 virtual ~VirtualKeyboardObserver() { |
| 76 keyboard::KeyboardController::GetInstance()->RemoveObserver(this); | 76 keyboard::KeyboardController::GetInstance()->RemoveObserver(this); |
| 77 } | 77 } |
| 78 | 78 |
| 79 private: | 79 private: |
| 80 virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE { | 80 virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override { |
| 81 HomeCard::Get()->UpdateVirtualKeyboardBounds(new_bounds); | 81 HomeCard::Get()->UpdateVirtualKeyboardBounds(new_bounds); |
| 82 } | 82 } |
| 83 | 83 |
| 84 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardObserver); | 84 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardObserver); |
| 85 }; | 85 }; |
| 86 | 86 |
| 87 void StartAthenaEnv(scoped_refptr<base::TaskRunner> blocking_task_runner) { | 87 void StartAthenaEnv(scoped_refptr<base::TaskRunner> blocking_task_runner) { |
| 88 athena::AthenaEnv::Create(); | 88 athena::AthenaEnv::Create(); |
| 89 | 89 |
| 90 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 90 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 athena::WindowManager::Shutdown(); | 163 athena::WindowManager::Shutdown(); |
| 164 athena::SystemUI::Shutdown(); | 164 athena::SystemUI::Shutdown(); |
| 165 athena::ScreenManager::Shutdown(); | 165 athena::ScreenManager::Shutdown(); |
| 166 athena::InputManager::Shutdown(); | 166 athena::InputManager::Shutdown(); |
| 167 athena::AthenaEnv::Shutdown(); | 167 athena::AthenaEnv::Shutdown(); |
| 168 | 168 |
| 169 ShutdownAthenaViewsDelegate(); | 169 ShutdownAthenaViewsDelegate(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 } // namespace athena | 172 } // namespace athena |
| OLD | NEW |