TabContentsWrapper -> TabContents, part 8.

chrome/browser/chromeos/login/simple_web_view_dialog.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/chromeos/login/simple_web_view_dialog.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/page_info_bubble_view.h"
 #include "chrome/browser/ui/views/reload_button.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 67 matching lines @@
 
 namespace chromeos {
 
 // Stub implementation of ContentSettingBubbleModelDelegate.
 class StubBubbleModelDelegate : public ContentSettingBubbleModelDelegate {
  public:
   StubBubbleModelDelegate() {}
   virtual ~StubBubbleModelDelegate() {}
 
   // ContentSettingBubbleModelDelegate implementation:
-  virtual void ShowCollectedCookiesDialog(
-      TabContentsWrapper* contents) OVERRIDE {
+  virtual void ShowCollectedCookiesDialog(TabContents* contents) OVERRIDE {
   }
 
   virtual void ShowContentSettingsPage(ContentSettingsType type) OVERRIDE {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StubBubbleModelDelegate);
 };
 
 // SimpleWebViewDialog class ---------------------------------------------------
@@ skipping 28 matching lines @@
   web_view_ = web_view_container_.get();
 
   // We create the WebContents ourselves because the TCW assumes ownership of
   // it. This should be reworked once we don't need to use the TCW here.
   WebContents* web_contents =
       WebContents::Create(ProfileManager::GetDefaultProfile(),
                           NULL,
                           MSG_ROUTING_NONE,
                           NULL,
                           NULL);
-  wrapper_.reset(new TabContentsWrapper(web_contents));
+  tab_contents_.reset(new TabContents(web_contents));
   web_view_->SetWebContents(web_contents);
   web_contents->SetDelegate(this);
   web_view_->LoadInitialURL(url);
 }
 
 void SimpleWebViewDialog::Init() {
   set_background(views::Background::CreateSolidBackground(SK_ColorWHITE));
 
   // Back/Forward buttons.
   back_ = new views::ImageButton(this);
@@ skipping 231 matching lines @@
 
 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) {
   if (reload_) {
     reload_->ChangeMode(
         is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD,
         force);
   }
 }
 
 }  // namespace chromeos