Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / athena / test / sample_activity.cc

diff --git a/src/athena/test/sample_activity.cc b/src/athena/test/sample_activity.cc
index 6c4c064..754a2eb 100644 (file)
--- a/src/athena/test/sample_activity.cc
+++ b/src/athena/test/sample_activity.cc
@@ -4,8 +4,10 @@
 
 #include "athena/test/sample_activity.h"
 
+#include "ui/gfx/image/image_skia.h"
 #include "ui/views/background.h"
 #include "ui/views/view.h"
+#include "ui/views/widget/widget.h"
 
 namespace athena {
 namespace test {
@@ -43,6 +45,15 @@ Activity::ActivityMediaState SampleActivity::GetMediaState() {
   return Activity::ACTIVITY_MEDIA_STATE_NONE;
 }
 
+aura::Window* SampleActivity::GetWindow() {
+  return !contents_view_ ? NULL
+                         : contents_view_->GetWidget()->GetNativeWindow();
+}
+
+content::WebContents* SampleActivity::GetWebContents() {
+  return NULL;
+}
+
 void SampleActivity::Init() {
 }
 
@@ -54,6 +65,10 @@ base::string16 SampleActivity::GetTitle() const {
   return title_;
 }
 
+gfx::ImageSkia SampleActivity::GetIcon() const {
+  return gfx::ImageSkia();
+}
+
 bool SampleActivity::UsesFrame() const {
   return true;
 }
@@ -67,12 +82,19 @@ views::View* SampleActivity::GetContentsView() {
   return contents_view_;
 }
 
-void SampleActivity::CreateOverviewModeImage() {
+views::Widget* SampleActivity::CreateWidget() {
+  return NULL;
 }
 
 gfx::ImageSkia SampleActivity::GetOverviewModeImage() {
   return gfx::ImageSkia();
 }
 
+void SampleActivity::PrepareContentsForOverview() {
+}
+
+void SampleActivity::ResetContentsView() {
+}
+
 }  // namespace test
 }  // namespace athena