Move dispatching and sending of the last extension specific messages out of TabContents and Rende...

chrome/browser/ui/web_applications/web_app_ui.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/web_applications/web_app_ui.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/task.h"
 #include "base/win/windows_version.h"
+#include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_registrar.h"
 
 #if defined(OS_LINUX)
 #include "base/environment.h"
@@ skipping 64 matching lines @@
   // Existing shortcuts.
   std::vector<FilePath> shortcut_files_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateShortcutWorker);
 };
 
 UpdateShortcutWorker::UpdateShortcutWorker(TabContentsWrapper* tab_contents)
     : tab_contents_(tab_contents),
       profile_path_(tab_contents->profile()->GetPath()) {
   web_app::GetShortcutInfoForTab(tab_contents_, &shortcut_info_);
-  web_app::GetIconsInfo(tab_contents_->tab_contents()->web_app_info(),
+  web_app::GetIconsInfo(tab_contents_->extension_tab_helper()->web_app_info(),
                         &unprocessed_icons_);
   file_name_ = web_app::internals::GetSanitizedFileName(shortcut_info_.title);
 
   registrar_.Add(this, NotificationType::TAB_CLOSING,
                  Source<NavigationController>(&tab_contents_->controller()));
 }
 
 void UpdateShortcutWorker::Run() {
   // Starting by downloading app icon.
   DownloadIcon();
@@ skipping 179 matching lines @@
 DISABLE_RUNNABLE_METHOD_REFCOUNT(UpdateShortcutWorker);
 #endif  // defined(OS_WIN)
 
 namespace web_app {
 
 void GetShortcutInfoForTab(TabContentsWrapper* tab_contents_wrapper,
                            ShellIntegration::ShortcutInfo* info) {
   DCHECK(info);  // Must provide a valid info.
   const TabContents* tab_contents = tab_contents_wrapper->tab_contents();
 
-  const WebApplicationInfo& app_info = tab_contents->web_app_info();
+  const WebApplicationInfo& app_info =
+      tab_contents_wrapper->extension_tab_helper()->web_app_info();
 
   info->url = app_info.app_url.is_empty() ? tab_contents->GetURL() :
                                             app_info.app_url;
   info->title = app_info.title.empty() ?
       (tab_contents->GetTitle().empty() ? UTF8ToUTF16(info->url.spec()) :
                                           tab_contents->GetTitle()) :
       app_info.title;
   info->description = app_info.description;
   info->favicon = tab_contents->GetFavicon();
 }
 
 void UpdateShortcutForTabContents(TabContentsWrapper* tab_contents) {
 #if defined(OS_WIN)
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(tab_contents);
   worker->Run();
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace web_app