Revert 291221 "Athena: Adding basic resource management framewor..."

trunk/src/athena/content/web_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/web_activity.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/input/public/accelerator_manager.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 329 matching lines @@
   return web_view_ && web_view_->IsDrawn();
 }
 
 Activity::ActivityMediaState WebActivity::GetMediaState() {
   // TODO(skuhne): The function GetTabMediaStateForContents(WebContents),
   // and the AudioStreamMonitor needs to be moved from Chrome into contents to
   // make it more modular and so that we can use it from here.
   return Activity::ACTIVITY_MEDIA_STATE_NONE;
 }
 
-aura::Window* WebActivity::GetWindow() {
-  return !web_view_ ? NULL : web_view_->GetWidget()->GetNativeWindow();
-}
-
 void WebActivity::Init() {
   DCHECK(web_view_);
   web_view_->InstallAccelerators();
 }
 
 SkColor WebActivity::GetRepresentativeColor() const {
   // TODO(sad): Compute the color from the favicon.
   return web_view_ ? title_color_ : kDefaultUnavailableColor;
 }
 
@@ skipping 34 matching lines @@
 void WebActivity::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 void WebActivity::DidChangeThemeColor(SkColor theme_color) {
   title_color_ = theme_color;
 }
 
 }  // namespace athena