Remove WebContents methods that duplicate WebContentsView methods.

chrome/browser/printing/print_preview_dialog_controller.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/printing/print_preview_dialog_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 22 matching lines @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
+#include "content/public/browser/web_contents_view.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using content::NativeWebKeyboardEvent;
 using content::NavigationController;
 using content::WebContents;
 using content::WebUIMessageHandler;
 using ui::WebDialogDelegate;
 using ui::WebDialogWebContentsDelegate;
@@ skipping 67 matching lines @@
 void PrintPreviewTabDelegate::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* /* handlers */) const {
   // PrintPreviewUI adds its own message handlers.
 }
 
 void PrintPreviewTabDelegate::GetDialogSize(gfx::Size* size) const {
   DCHECK(size);
   const gfx::Size kMinDialogSize(800, 480);
   const int kBorder = 50;
   gfx::Rect rect;
-  initiator_tab_->GetContainerBounds(&rect);
+  initiator_tab_->GetView()->GetContainerBounds(&rect);
   size->set_width(std::max(rect.width(), kMinDialogSize.width()) - kBorder);
   size->set_height(std::max(rect.height(), kMinDialogSize.height()) - kBorder);
 
 #if defined(OS_MACOSX)
   // Limit the maximum size on MacOS X.
   // http://crbug.com/105815
   const gfx::Size kMaxDialogSize(1000, 660);
   size->set_width(std::min(size->width(), kMaxDialogSize.width()));
   size->set_height(std::min(size->height(), kMaxDialogSize.height()));
 #endif
@@ skipping 157 matching lines @@
 void PrintPreviewDialogController::EraseInitiatorTabInfo(
     WebContents* preview_tab) {
   PrintPreviewTabMap::iterator it = preview_tab_map_.find(preview_tab);
   if (it == preview_tab_map_.end())
     return;
 
   RemoveObservers(it->second);
   preview_tab_map_[preview_tab] = NULL;
 }
 
-bool PrintPreviewDialogController::is_creating_print_preview_dialog() const {
-  return is_creating_print_preview_dialog_;
-}
-
 PrintPreviewDialogController::~PrintPreviewDialogController() {}
 
 void PrintPreviewDialogController::OnRendererProcessClosed(
     content::RenderProcessHost* rph) {
   // Store tabs in a vector and deal with them after iterating through
   // |preview_tab_map_| because RemoveFooTab() can change |preview_tab_map_|.
   std::vector<WebContents*> closed_initiator_tabs;
   std::vector<WebContents*> closed_preview_tabs;
   for (PrintPreviewTabMap::iterator iter = preview_tab_map_.begin();
        iter != preview_tab_map_.end(); ++iter) {
@@ skipping 105 matching lines @@
   EnableInternalPDFPluginForTab(preview_tab);
   PrintViewManager::CreateForWebContents(preview_tab);
 
   // Add an entry to the map.
   preview_tab_map_[preview_tab] = initiator_tab;
   waiting_for_new_preview_page_ = true;
 
   AddObservers(initiator_tab);
   AddObservers(preview_tab);
 
+  if (!print_preview_tab_created_callback_.is_null())
+    print_preview_tab_created_callback_.Run();
+
   return preview_tab;
 }
 
 void PrintPreviewDialogController::SaveInitiatorTabTitle(
     WebContents* preview_dialog) {
   WebContents* initiator_tab = GetInitiatorTab(preview_dialog);
   if (initiator_tab && preview_dialog->GetWebUI()) {
     PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
         preview_dialog->GetWebUI()->GetController());
     print_preview_ui->SetInitiatorTabTitle(
@@ skipping 67 matching lines @@
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
       preview_tab->GetWebUI()->GetController());
   if (print_preview_ui)
     print_preview_ui->OnPrintPreviewDialogDestroyed();
 
   preview_tab_map_.erase(preview_tab);
   RemoveObservers(preview_tab);
 }
 
 }  // namespace printing