Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / athena / main / placeholder.cc

diff --git a/src/athena/main/placeholder.cc b/src/athena/main/placeholder.cc
index ba93ce8..c0d89f0 100644 (file)
--- a/src/athena/main/placeholder.cc
+++ b/src/athena/main/placeholder.cc
@@ -4,10 +4,10 @@
 
 #include "athena/main/placeholder.h"
 
+#include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_factory.h"
-#include "athena/activity/public/activity_manager.h"
-#include "athena/screen/public/screen_manager.h"
-#include "grit/athena_resources.h"
+#include "athena/resources/grit/athena_resources.h"
+#include "athena/system/public/system_ui.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ -16,15 +16,16 @@ void CreateTestPages(content::BrowserContext* browser_context) {
       "http://cyan.bikeshed.com", "https://news.google.com",
       "http://blue.bikeshed.com", "https://www.google.com",
   };
+  athena::ActivityFactory* factory = athena::ActivityFactory::Get();
   for (size_t i = 0; i < arraysize(kTestURLs); ++i) {
-    athena::ActivityManager::Get()->AddActivity(
-        athena::ActivityFactory::Get()->CreateWebActivity(browser_context,
-                                                          GURL(kTestURLs[i])));
+    athena::Activity* activity = factory->CreateWebActivity(
+        browser_context, base::string16(), GURL(kTestURLs[i]));
+    athena::Activity::Show(activity);
   }
 }
 
 void SetupBackgroundImage() {
   const gfx::ImageSkia wallpaper = *ui::ResourceBundle::GetSharedInstance()
       .GetImageSkiaNamed(IDR_ATHENA_BACKGROUND);
-  athena::ScreenManager::Get()->SetBackgroundImage(wallpaper);
+  athena::SystemUI::Get()->SetBackgroundImage(wallpaper);
 }