athena: Remove ActivityViewModel::CreateWidget().

athena/content/app_activity.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/content/app_activity.h"
 
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/content_proxy.h"
 #include "athena/content/media_utils.h"
@@ skipping 75 matching lines @@
          current_state_ != ACTIVITY_UNLOADED;
 }
 
 Activity::ActivityMediaState AppActivity::GetMediaState() {
   return current_state_ == ACTIVITY_UNLOADED ?
       Activity::ACTIVITY_MEDIA_STATE_NONE :
       GetActivityMediaState(GetWebContents());
 }
 
 aura::Window* AppActivity::GetWindow() {
-  return !web_view_ ? nullptr : web_view_->GetWidget()->GetNativeWindow();
+  return web_view_ && web_view_->GetWidget()
+             ? web_view_->GetWidget()->GetNativeWindow()
+             : nullptr;
 }
 
 content::WebContents* AppActivity::GetWebContents() {
   return !web_view_ ? nullptr : web_view_->GetWebContents();
 }
 
 void AppActivity::Init() {
+  // Before we remove the proxy, we have to register the activity and
+  // initialize its to move it to the proper activity list location.
+  RegisterActivity();
+
   DCHECK(app_activity_registry_);
   Activity* app_proxy = app_activity_registry_->unloaded_activity_proxy();
   if (app_proxy) {
     // Note: At this time the |AppActivity| did not get registered to the
     // |ResourceManager| - so we can move it around if needed.
     WindowListProvider* window_list_provider =
         WindowManager::Get()->GetWindowListProvider();
     // TODO(skuhne): After the decision is made how we want to handle visibility
     // transitions (issue 421680) this code might change.
     // If the proxy was the active window, its deletion will cause a window
@@ skipping 14 matching lines @@
     } else {
       // The app window goes in front of the proxy window (we need to first
       // place the window before we can delete it).
       window_list_provider->StackWindowFrontOf(GetWindow(),
                                                app_proxy->GetWindow());
       Activity::Delete(app_proxy);
     }
     // The proxy should now be deleted.
     DCHECK(!app_activity_registry_->unloaded_activity_proxy());
   }
+
+  // Make sure the content gets properly shown.
+  if (current_state_ == ACTIVITY_VISIBLE) {
+    HideContentProxy();
+  } else if (current_state_ == ACTIVITY_INVISIBLE) {
+    ShowContentProxy();
+  } else {
+    // If not previously specified, we change the state now to invisible..
+    SetCurrentState(ACTIVITY_INVISIBLE);
+  }
 }
 
 SkColor AppActivity::GetRepresentativeColor() const {
   // TODO(sad): Compute the color from the favicon.
   return SK_ColorGRAY;
 }
 
 base::string16 AppActivity::GetTitle() const {
   return web_view_->GetWebContents()->GetTitle();
 }
 
 gfx::ImageSkia AppActivity::GetIcon() const {
   return gfx::ImageSkia();
 }
 
 bool AppActivity::UsesFrame() const {
   return false;
 }
 
-views::Widget* AppActivity::CreateWidget() {
-  // Before we remove the proxy, we have to register the activity and
-  // initialize its to move it to the proper activity list location.
-  RegisterActivity();
-  Init();
-  // Make sure the content gets properly shown.
-  if (current_state_ == ACTIVITY_VISIBLE) {
-    HideContentProxy();
-  } else if (current_state_ == ACTIVITY_INVISIBLE) {
-    ShowContentProxy();
-  } else {
-    // If not previously specified, we change the state now to invisible..
-    SetCurrentState(ACTIVITY_INVISIBLE);
-  }
-  return web_view_->GetWidget();
-}
-
 views::View* AppActivity::GetContentsView() {
   return web_view_;
 }
 
 gfx::ImageSkia AppActivity::GetOverviewModeImage() {
   if (content_proxy_.get())
     return content_proxy_->GetContentImage();
   return gfx::ImageSkia();
 }
 
@@ skipping 53 matching lines @@
 void AppActivity::HideContentProxy() {
   content_proxy_.reset();
 }
 
 void AppActivity::ShowContentProxy() {
   if (!content_proxy_.get() && web_view_)
     content_proxy_.reset(new ContentProxy(web_view_));
 }
 
 }  // namespace athena