TabContentsWrapper -> TabContents, part 49.

chrome/browser/ui/web_applications/web_app_ui.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/environment.h"
 #endif
 
 using content::BrowserThread;
 using content::NavigationController;
 using content::WebContents;
 
 namespace {
 
 #if defined(OS_WIN)
 // UpdateShortcutWorker holds all context data needed for update shortcut.
 // It schedules a pre-update check to find all shortcuts that needs to be
 // updated. If there are such shortcuts, it schedules icon download and
 // update them when icons are downloaded. It observes TAB_CLOSING notification
 // and cancels all the work when the underlying tab is closing.
 class UpdateShortcutWorker : public content::NotificationObserver {
  public:
-  explicit UpdateShortcutWorker(TabContentsWrapper* tab_contents);
+  explicit UpdateShortcutWorker(TabContents* tab_contents);
 
   void Run();
 
  private:
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
-  // Downloads icon via TabContentsWrapper.
+  // Downloads icon via TabContents.
   void DownloadIcon();
 
   // Callback when icon downloaded.
   void OnIconDownloaded(int download_id, bool errored, const SkBitmap& image);
 
   // Checks if shortcuts exists on desktop, start menu and quick launch.
   void CheckExistingShortcuts();
 
   // Update shortcut files and icons.
   void UpdateShortcuts();
   void UpdateShortcutsOnFileThread();
 
   // Callback after shortcuts are updated.
   void OnShortcutsUpdated(bool);
 
   // Deletes the worker on UI thread where it gets created.
   void DeleteMe();
   void DeleteMeOnUIThread();
 
   content::NotificationRegistrar registrar_;
 
-  // Underlying TabContentsWrapper whose shortcuts will be updated.
-  TabContentsWrapper* tab_contents_;
+  // Underlying TabContents whose shortcuts will be updated.
+  TabContents* tab_contents_;
 
   // Icons info from tab_contents_'s web app data.
   web_app::IconInfoList unprocessed_icons_;
 
   // Cached shortcut data from the tab_contents_.
   ShellIntegration::ShortcutInfo shortcut_info_;
 
   // Our copy of profile path.
   FilePath profile_path_;
 
   // File name of shortcut/ico file based on app title.
   FilePath file_name_;
 
   // Existing shortcuts.
   std::vector<FilePath> shortcut_files_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateShortcutWorker);
 };
 
-UpdateShortcutWorker::UpdateShortcutWorker(TabContentsWrapper* tab_contents)
+UpdateShortcutWorker::UpdateShortcutWorker(TabContents* tab_contents)
     : tab_contents_(tab_contents),
       profile_path_(tab_contents->profile()->GetPath()) {
   web_app::GetShortcutInfoForTab(tab_contents_, &shortcut_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,
       chrome::NOTIFICATION_TAB_CLOSING,
@@ skipping 182 matching lines @@
 void UpdateShortcutWorker::DeleteMeOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   delete this;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace
 
 namespace web_app {
 
-void GetShortcutInfoForTab(TabContentsWrapper* tab_contents_wrapper,
+void GetShortcutInfoForTab(TabContents* tab_contents,
                            ShellIntegration::ShortcutInfo* info) {
   DCHECK(info);  // Must provide a valid info.
-  const WebContents* web_contents = tab_contents_wrapper->web_contents();
+  const WebContents* web_contents = tab_contents->web_contents();
 
   const WebApplicationInfo& app_info =
-      tab_contents_wrapper->extension_tab_helper()->web_app_info();
+      tab_contents->extension_tab_helper()->web_app_info();
 
   info->url = app_info.app_url.is_empty() ? web_contents->GetURL() :
                                             app_info.app_url;
   info->title = app_info.title.empty() ?
       (web_contents->GetTitle().empty() ? UTF8ToUTF16(info->url.spec()) :
                                           web_contents->GetTitle()) :
       app_info.title;
   info->description = app_info.description;
   info->favicon =
-      gfx::Image(tab_contents_wrapper->favicon_tab_helper()->GetFavicon());
+      gfx::Image(tab_contents->favicon_tab_helper()->GetFavicon());
 }
 
-void UpdateShortcutForTabContents(TabContentsWrapper* tab_contents) {
+void UpdateShortcutForTabContents(TabContents* 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