Index: athena/ui/athena_ui_main.cc |
diff --git a/athena/ui/athena_ui_main.cc b/athena/ui/athena_ui_main.cc |
index badcfc4dc82a21508078492da9d1267eb7df0cbd..64128e094e9ed7584506b00b2756b2d1b11f0fb7 100644 |
--- a/athena/ui/athena_ui_main.cc |
+++ b/athena/ui/athena_ui_main.cc |
@@ -4,15 +4,20 @@ |
#include "athena/home/public/home_card.h" |
#include "athena/screen/public/screen_manager.h" |
+#include "athena/task/public/task_manager.h" |
+#include "athena/ui/sample_task.h" |
#include "athena/wm/public/window_manager.h" |
#include "base/at_exit.h" |
#include "base/command_line.h" |
#include "base/i18n/icu_util.h" |
#include "base/message_loop/message_loop.h" |
+#include "base/path_service.h" |
#include "base/run_loop.h" |
#include "ui/aura/test/test_screen.h" |
#include "ui/aura/window_tree_host.h" |
#include "ui/base/ime/input_method_initializer.h" |
+#include "ui/base/resource/resource_bundle.h" |
+#include "ui/base/ui_base_paths.h" |
#include "ui/compositor/compositor.h" |
#include "ui/compositor/test/context_factories_for_test.h" |
#include "ui/gl/gl_surface.h" |
@@ -26,6 +31,7 @@ class UIShell { |
InitIME(); |
InitWindow(); |
InitAthenaUI(); |
+ InitSampleTasks(); |
} |
void Show() { |
@@ -59,6 +65,13 @@ class UIShell { |
athena::ScreenManager::Create(root); |
athena::WindowManager::Create(); |
athena::HomeCard::Create(); |
+ athena::TaskManager::Create(); |
+ } |
+ |
+ void InitSampleTasks() { |
+ athena::Task* task = |
+ new SampleTask(SK_ColorRED, SK_ColorGREEN, std::string("Task 1")); |
+ athena::TaskManager::Get()->AddTask(task); |
} |
scoped_ptr<aura::TestScreen> test_screen_; |
@@ -72,10 +85,15 @@ int main(int argc, const char **argv) { |
setlocale(LC_ALL, ""); |
base::AtExitManager exit_manager; |
+ ui::RegisterPathProvider(); |
base::CommandLine::Init(argc, argv); |
base::i18n::InitializeICU(); |
gfx::GLSurface::InitializeOneOffForTests(); |
+ base::FilePath ui_test_pak_path; |
+ DCHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); |
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); |
+ |
base::MessageLoop message_loop(base::MessageLoop::TYPE_UI); |
(new UIShell())->Show(); |
base::RunLoop run_loop; |