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

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/public/app_registry.h"
 #include "athena/wm/public/window_list_provider.h"
@@ skipping 98 matching lines @@
 base::string16 AppActivity::GetTitle() const {
   return web_view_->GetWebContents()->GetTitle();
 }
 
 bool AppActivity::UsesFrame() const {
   return false;
 }
 
 views::View* AppActivity::GetContentsView() {
   if (!web_view_) {
-    // TODO(oshima): use apps::NativeAppWindowViews
-    content::WebContents* web_contents = GetWebContents();
-    web_view_ = new views::WebView(web_contents->GetBrowserContext());
-    web_view_->SetWebContents(web_contents);
+    web_view_ = GetWebView();
     // Make sure the content gets properly shown.
     if (current_state_ == ACTIVITY_VISIBLE) {
       MakeVisible();
     } else if (current_state_ == ACTIVITY_INVISIBLE) {
       MakeInvisible();
     } else {
       // If not previously specified, we change the state now to invisible..
       SetCurrentState(ACTIVITY_INVISIBLE);
     }
-    Observe(web_contents);
     RegisterActivity();
   }
   return web_view_;
 }
 
 void AppActivity::CreateOverviewModeImage() {
   // TODO(skuhne): Implement this!
 }
 
 gfx::ImageSkia AppActivity::GetOverviewModeImage() {
@@ skipping 24 matching lines @@
 
 void AppActivity::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 // Register an |activity| with an application.
 // Note: This should only get called once for an |app_window| of the
 // |activity|.
 void AppActivity::RegisterActivity() {
-  content::WebContents* web_contents = GetWebContents();
+  content::WebContents* web_contents = web_view_->GetWebContents();
   AppRegistry* app_registry = AppRegistry::Get();
   // Get the application's registry.
   app_activity_registry_ = app_registry->GetAppActivityRegistry(
       app_id_, web_contents->GetBrowserContext());
   DCHECK(app_activity_registry_);
   // Register the activity.
   app_activity_registry_->RegisterAppActivity(this);
 }
 
 void AppActivity::MakeVisible() {
@@ skipping 24 matching lines @@
     overview_mode_image_ = gfx::ImageSkia();
   }
   // Now we can hide this.
   // Note: This might have to be done asynchronously after the readback took
   // place.
   web_view_->SetVisible(false);
   web_view_->GetWebContents()->GetNativeView()->Hide();
 }
 
 }  // namespace athena