athena: Remove ActivityViewModel::CreateWidget().

athena/activity/activity_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/activity_manager_impl.h"
 
 #include <algorithm>
 
 #include "athena/activity/activity_widget_delegate.h"
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_manager_observer.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "base/logging.h"
 #include "base/observer_list.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 
 namespace {
 
 ActivityManager* instance = nullptr;
 
 views::Widget* CreateWidget(Activity* activity) {
-  ActivityViewModel* view_model = activity->GetActivityViewModel();
-  views::Widget* widget = view_model->CreateWidget();
+  aura::Window* window = activity->GetWindow();
+  views::Widget* widget =
+      window ? views::Widget::GetWidgetForNativeView(window) : nullptr;
   if (widget)
     return widget;
   widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
-  params.delegate = new ActivityWidgetDelegate(view_model);
+  params.delegate =
+      new ActivityWidgetDelegate(activity->GetActivityViewModel());
   widget->Init(params);
   activity->GetActivityViewModel()->Init();
   return widget;
 }
 
 views::Widget* GetWidget(Activity* activity) {
   CHECK(activity);
   CHECK(activity->GetWindow());
   return views::Widget::GetWidgetForNativeWindow(activity->GetWindow());
 }
@@ skipping 84 matching lines @@
   return instance;
 }
 
 void ActivityManager::Shutdown() {
   CHECK(instance);
   delete instance;
 }
 
 
 }  // namespace athena