Use webview in web activity

athena/activity/activity_view_manager_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/activity/public/activity_view_manager.h"
 
 #include <algorithm>
 #include <map>
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "athena/screen/public/screen_manager.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/label.h"
-#include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 namespace {
 
 class ActivityWidget : public views::LayoutManager {
  public:
   explicit ActivityWidget(Activity* activity)
       : activity_(activity),
         container_(NULL),
         title_(NULL),
-        host_(NULL),
+        content_(NULL),
         widget_(NULL) {
     container_ = new views::View;
 
     title_ = new views::Label();
     title_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     const gfx::FontList& font_list = title_->font_list();
     title_->SetFontList(font_list.Derive(1, gfx::Font::BOLD));
     title_->SetEnabledColor(SK_ColorBLACK);
     container_->AddChildView(title_);
     container_->SetLayoutManager(this);
-
-    host_ = new views::NativeViewHost();
-    container_->AddChildView(host_);
+    content_ = activity->GetActivityViewModel()->GetContentsView();
+    container_->AddChildView(content_);
 
     widget_ = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.context = ScreenManager::Get()->GetContext();
     params.delegate = NULL;
     params.activatable = views::Widget::InitParams::ACTIVATABLE_YES;
     widget_->Init(params);
     widget_->SetContentsView(container_);
-
-    host_->Attach(activity_->GetActivityViewModel()->GetNativeWindow());
   }
 
   virtual ~ActivityWidget() {}
 
   void Show() {
     Update();
     widget_->Show();
   }
 
   void Update() {
     title_->SetText(
         base::UTF8ToUTF16(activity_->GetActivityViewModel()->GetTitle()));
     SkColor bgcolor =
         activity_->GetActivityViewModel()->GetRepresentativeColor();
     title_->set_background(views::Background::CreateSolidBackground(bgcolor));
     title_->SetBackgroundColor(bgcolor);
   }
 
  private:
   // views::LayoutManager:
   virtual void Layout(views::View* host) OVERRIDE {
     CHECK_EQ(container_, host);
-    const gfx::Rect& host_bounds = host->bounds();
+    const gfx::Rect& content_bounds = host->bounds();
     const int kTitleHeight = 25;
-    title_->SetBounds(0, 0, host_bounds.width(), kTitleHeight);
-    host_->SetBounds(0,
-                     kTitleHeight,
-                     host_bounds.width(),
-                     host_bounds.height() - kTitleHeight);
+    title_->SetBounds(0, 0, content_bounds.width(), kTitleHeight);
+    content_->SetBounds(0,
+                        kTitleHeight,
+                        content_bounds.width(),
+                        content_bounds.height() - kTitleHeight);
   }
 
   virtual gfx::Size GetPreferredSize(const views::View* host) const OVERRIDE {
     CHECK_EQ(container_, host);
     gfx::Size size;
     gfx::Size label_size = title_->GetPreferredSize();
-    gfx::Size host_size = host_->GetPreferredSize();
+    gfx::Size content_size = content_->GetPreferredSize();
 
-    size.set_width(std::max(label_size.width(), host_size.width()));
-    size.set_height(label_size.height() + host_size.height());
+    size.set_width(std::max(label_size.width(), content_size.width()));
+    size.set_height(label_size.height() + content_size.height());
     return size;
   }
 
   Activity* activity_;
   views::View* container_;
   views::Label* title_;
-  views::NativeViewHost* host_;
+  views::View* content_;
   views::Widget* widget_;
 
   DISALLOW_COPY_AND_ASSIGN(ActivityWidget);
 };
 
 ActivityViewManager* instance = NULL;
 
 class ActivityViewManagerImpl : public ActivityViewManager {
  public:
   ActivityViewManagerImpl() {
@@ skipping 45 matching lines @@
 ActivityViewManager* ActivityViewManager::Get() {
   return instance;
 }
 
 void ActivityViewManager::Shutdown() {
   CHECK(instance);
   delete instance;
 }
 
 }  // namespace athena