V2 app support step2 : Use NativeAppWindow for Activity's window.

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/activity_widget_delegate.h"
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "athena/screen/public/screen_manager.h"
 #include "ui/aura/window.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace athena {
 namespace {
 
 typedef std::map<Activity*, views::Widget*> ActivityWidgetMap;
 
 views::Widget* CreateWidget(Activity* activity) {
   ActivityViewModel* view_model = activity->GetActivityViewModel();
-  views::Widget* widget = new views::Widget;
+  views::Widget* widget = view_model->CreateWidget();
+  if (widget)
+    return widget;
+  widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.delegate = new ActivityWidgetDelegate(view_model);
-  params.activatable = views::Widget::InitParams::ACTIVATABLE_YES;
   widget->Init(params);
   return widget;
 }
 
 ActivityViewManager* instance = NULL;
 
 class ActivityViewManagerImpl : public ActivityViewManager,
                                 public views::WidgetObserver {
  public:
   ActivityViewManagerImpl() {
@@ skipping 69 matching lines @@
 ActivityViewManager* ActivityViewManager::Get() {
   return instance;
 }
 
 void ActivityViewManager::Shutdown() {
   CHECK(instance);
   delete instance;
 }
 
 }  // namespace athena