Consolidate AppControllDelegate to ExtensionsDelegate

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_content_control_delegate.h"
 #include "athena/content/public/app_registry.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 
 // TODO(mukai): specifies the same accelerators of WebActivity.
-AppActivity::AppActivity()
-    : web_view_(NULL),
+AppActivity::AppActivity(const std::string& app_id)
+    : app_id_(app_id),
+      web_view_(NULL),
       current_state_(ACTIVITY_UNLOADED),
       app_activity_registry_(NULL) {
 }
 
 AppActivity::~AppActivity() {
   // If this activity is registered, we unregister it now.
   if (app_activity_registry_)
     app_activity_registry_->UnregisterAppActivity(this);
 }
 
@@ skipping 82 matching lines @@
 }
 
 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);
     SetCurrentState(ACTIVITY_INVISIBLE);
     Observe(web_contents);
     overview_mode_image_ = gfx::ImageSkia();

[Mr4D (OOO till 08-26), 2014/08/27 20:22:19]

Call RegisterActivity from here (or move the code there).

[oshima, 2014/08/27 21:20:19]

Done.

   }
   return web_view_;
 }
 
 void AppActivity::CreateOverviewModeImage() {
   // TODO(skuhne): Implement this!
 }
 
 gfx::ImageSkia AppActivity::GetOverviewModeImage() {
   return overview_mode_image_;
 }
 
 void AppActivity::TitleWasSet(content::NavigationEntry* entry,
                               bool explicit_set) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 void AppActivity::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 void AppActivity::DidStartNavigationToPendingEntry(
       const GURL& url,
       content::NavigationController::ReloadType reload_type) {

[Mr4D (OOO till 08-26), 2014/08/27 20:22:19]

Since this isn't needed anymore: Remove this function altogether.

[oshima, 2014/08/27 21:20:19]

Done.

   if (!app_activity_registry_)
     RegisterActivity();
 }
 
 // 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();
   AppRegistry* app_registry = AppRegistry::Get();
   // Get the application's registry.
   app_activity_registry_ = app_registry->GetAppActivityRegistry(
-          app_registry->GetDelegate()->GetApplicationID(web_contents),
-          web_contents->GetBrowserContext());
+      app_id_, web_contents->GetBrowserContext());
   DCHECK(app_activity_registry_);
   // Register the activity.
   app_activity_registry_->RegisterAppActivity(this);
 }
 
 }  // namespace athena