Move a bunch of stuff out of WebContents. I removed a bunch of render view ho...

chrome/browser/web_contents.cc

 // Copyright (c) 2006-2008 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/web_contents.h"
 
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 264 matching lines @@
 
 void WebContents::SizeContents(const gfx::Size& size) {
   if (view())
     view()->SetSize(size);
   if (find_in_page_controller_.get())
     find_in_page_controller_->RespondToResize(size);
   RepositionSupressedPopupsToFit(size);
 }
 
 void WebContents::FirePageBeforeUnload() {
   render_view_host()->FirePageBeforeUnload();

[huanr, 2008/09/25 18:01:39]

what is the reason to keep this function in WebContents?

 }
 
-void WebContents::FirePageUnload() {
-  render_view_host()->FirePageUnload();
-}
-
 void WebContents::Destroy() {
   // Tell the notification service we no longer want notifications.
   NotificationService::current()->
       RemoveObserver(this, NOTIFY_URLS_STARRED,
                      NotificationService::AllSources());
   NotificationService::current()->
       RemoveObserver(this, NOTIFY_BOOKMARK_MODEL_LOADED,
                      NotificationService::AllSources());
 
   // Destroy the print manager right now since a Print command may be pending.
@@ skipping 375 matching lines @@
     find_in_page_controller_->DidBecomeUnselected();
 
   TabContents::WasHidden();
 }
 
 void WebContents::StartFinding(int request_id,
                                const std::wstring& search_string,
                                bool forward,
                                bool match_case,
                                bool find_next) {
-  if (search_string.empty())
-    return;
   render_view_host()->StartFinding(request_id, search_string, forward,
                                    match_case, find_next);
 }
 
 void WebContents::StopFinding(bool clear_selection) {
   render_view_host()->StopFinding(clear_selection);
 }
 
 void WebContents::OpenFindInPageWindow(const Browser& browser) {
   if (!find_in_page_controller_.get()) {
@@ skipping 40 matching lines @@
   if (IsFindWindowFullyVisible() &&
       ::IsWindow(find_wnd) &&
       ::GetWindowRect(find_wnd, &window_rect)) {
     *x = window_rect.TopLeft().x;
     *y = window_rect.TopLeft().y;
     return true;     
   }
 
   return false;
 }
-
-void WebContents::AlterTextSize(text_zoom::TextSize size) {
-  render_view_host()->AlterTextSize(size);
-  // TODO(creis): should this be propagated to other and future RVHs?
-}
-
-void WebContents::SetPageEncoding(const std::wstring& encoding_name) {
-  render_view_host()->SetPageEncoding(encoding_name);
-  // TODO(creis): should this be propagated to other and future RVHs?
-}
-
-void WebContents::CopyImageAt(int x, int y) {
-  render_view_host()->CopyImageAt(x, y);
-}
-
-void WebContents::InspectElementAt(int x, int y) {
-  render_view_host()->InspectElementAt(x, y);
-}
-
-void WebContents::ShowJavaScriptConsole() {
-  render_view_host()->ShowJavaScriptConsole();
-}
-
-void WebContents::AllowDomAutomationBindings() {
-  render_view_host()->AllowDomAutomationBindings();
-  // TODO(creis): should this be propagated to other and future RVHs?
-}
-
 void WebContents::OnJavaScriptMessageBoxClosed(IPC::Message* reply_msg,
                                                bool success,
                                                const std::wstring& prompt) {
   last_javascript_message_dismissal_ = TimeTicks::Now();
   render_manager_.OnJavaScriptMessageBoxClosed(reply_msg, success, prompt);
 }
 
 // Generic NotificationObserver callback.
 void WebContents::Observe(NotificationType type,
                           const NotificationSource& source,
@@ skipping 55 matching lines @@
   if (!notify_disconnection_)
     return;
 
   notify_disconnection_ = false;
   NotificationService::current()->
       Notify(NOTIFY_WEB_CONTENTS_DISCONNECTED,
              Source<WebContents>(this),
              NotificationService::NoDetails());
 }
 
-void WebContents::SetSuppressJavascriptMessageBoxes(
-    bool suppress_javascript_messages) {
-  suppress_javascript_messages_ = suppress_javascript_messages;
-}
-
 void WebContents::UpdateHistoryForNavigation(const GURL& display_url,
     const ViewHostMsg_FrameNavigate_Params& params) {
   if (profile()->IsOffTheRecord())
     return;
 
   // Add to history service.
   HistoryService* hs = profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
   if (hs) {
     if (PageTransition::IsMainFrame(params.transition) &&
         display_url != params.url) {
@@ skipping 64 matching lines @@
 
 InfoBarView* WebContents::GetInfoBarView() {
   if (info_bar_view_.get() == NULL) {
     info_bar_view_.reset(new InfoBarView(this));
     // The WebContents owns the info-bar.
     info_bar_view_->SetParentOwned(false);
   }
   return info_bar_view_.get();
 }
 
-void WebContents::ExecuteJavascriptInWebFrame(
-    const std::wstring& frame_xpath, const std::wstring& jscript) {
-  render_view_host()->ExecuteJavascriptInWebFrame(frame_xpath, jscript);
-}
-
-void WebContents::AddMessageToConsole(
-    const std::wstring& frame_xpath, const std::wstring& msg,
-    ConsoleMessageLevel level) {
-  render_view_host()->AddMessageToConsole(frame_xpath, msg, level);
-}
-
-void WebContents::Undo() {
-   render_view_host()->Undo();
-}
-
-void WebContents::Redo() {
-   render_view_host()->Redo();
-}
-
-void WebContents::Replace(const std::wstring& text) {
-   render_view_host()->Replace(text);
-}
-
-void WebContents::AddToDictionary(const std::wstring& word) {
-  render_view_host()->AddToDictionary(word);
-}
-
-void WebContents::Delete() {
-   render_view_host()->Delete();
-}
-
-void WebContents::SelectAll() {
-   render_view_host()->SelectAll();
-}
-
-void WebContents::StartFileUpload(const std::wstring& file_path,
-                                  const std::wstring& form,
-                                  const std::wstring& file,
-                                  const std::wstring& submit,
-                                  const std::wstring& other_values) {
-  render_view_host()->UploadFile(file_path, form, file, submit, other_values);
-}
-
 void WebContents::SetWebApp(WebApp* web_app) {
   if (web_app_.get()) {
     web_app_->RemoveObserver(this);
     web_app_->SetWebContents(NULL);
   }
 
   web_app_ = web_app;
   if (web_app) {
     web_app->AddObserver(this);
     web_app_->SetWebContents(this);
@@ skipping 21 matching lines @@
   }
   DCHECK(!pending_install_.icon.isNull()) << "Menu item should be disabled.";
   if (pending_install_.title.empty())
     pending_install_.title = UTF8ToWide(GetURL().spec());
 
   // Request the application info. When done OnDidGetApplicationInfo is invoked
   // and we'll create the shortcut.
   render_view_host()->GetApplicationInfo(pending_install_.page_id);
 }
 
-void WebContents::FillForm(const FormData& form) {
-  render_view_host()->FillForm(form);
-}
-
-void WebContents::FillPasswordForm(
-    const PasswordFormDomManager::FillData& form_data) {
-  render_view_host()->FillPasswordForm(form_data);
-}
-
-void WebContents::DragTargetDragEnter(const WebDropData& drop_data,
-    const gfx::Point& client_pt, const gfx::Point& screen_pt) {
-  render_view_host()->DragTargetDragEnter(drop_data, client_pt, screen_pt);
-}
-
-void WebContents::DragTargetDragOver(
-    const gfx::Point& client_pt, const gfx::Point& screen_pt) {
-  render_view_host()->DragTargetDragOver(client_pt, screen_pt);
-}
-
-void WebContents::DragTargetDragLeave() {
-  render_view_host()->DragTargetDragLeave();
-}
-
-void WebContents::DragTargetDrop(
-    const gfx::Point& client_pt, const gfx::Point& screen_pt) {
-  render_view_host()->DragTargetDrop(client_pt, screen_pt);
-}
-
 PasswordManager* WebContents::GetPasswordManager() {
   if (password_manager_.get() == NULL)
     password_manager_.reset(new PasswordManager(this));
   return password_manager_.get();
 }
 
 PluginInstaller* WebContents::GetPluginInstaller() {
   if (plugin_installer_.get() == NULL)
     plugin_installer_.reset(new PluginInstaller(this));
   return plugin_installer_.get();
 }
 
 bool WebContents::IsActiveEntry(int32 page_id) {
   NavigationEntry* active_entry = controller()->GetActiveEntry();
   return (active_entry != NULL &&
           active_entry->site_instance() == GetSiteInstance() &&
           active_entry->page_id() == page_id);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderViewHostDelegate implementation:
 
-RenderViewHostDelegate::FindInPage* WebContents::GetFindInPageDelegate() {
+RenderViewHostDelegate::FindInPage* WebContents::GetFindInPageDelegate() const {
   // The find in page controller implements this interface for us. Our return
   // value can be NULL, so it's fine if the find in controller doesn't exist.
   return find_in_page_controller_.get();
 }
 
+RenderViewHostDelegate::Save* WebContents::GetSaveDelegate() const {
+  return save_package_.get();  // May be NULL, but we can return NULL.
+}
+
 Profile* WebContents::GetProfile() const {
   return profile();
 }
 
 void WebContents::CreateView(int route_id, HANDLE modal_dialog_event) {
   WebContents* new_view = new WebContents(profile(),
                                           GetSiteInstance(),
                                           render_view_factory_,
                                           route_id,
                                           modal_dialog_event);
@@ skipping 690 matching lines @@
 
 void WebContents::ProcessExternalHostMessage(const std::string& receiver,
                                              const std::string& message) {
   if (delegate())
     delegate()->ForwardMessageToExternalHost(receiver, message);
 }
 
 void WebContents::GoToEntryAtOffset(int offset) {
   if (!controller())
     return;
-
   controller()->GoToOffset(offset);
 }
 
 void WebContents::GetHistoryListCount(int* back_list_count,
                                       int* forward_list_count) {
   *back_list_count = 0;
   *forward_list_count = 0;
 
   if (controller()) {
     int current_index = controller()->GetLastCommittedEntryIndex();
@@ skipping 613 matching lines @@
       return l10n_util::GetString(IDS_LOAD_STATE_SENDING_REQUEST);
     case net::LOAD_STATE_WAITING_FOR_RESPONSE:
       return l10n_util::GetStringF(IDS_LOAD_STATE_WAITING_FOR_RESPONSE,
                                    load_state_host_);
     // Ignore net::LOAD_STATE_READING_RESPONSE and net::LOAD_STATE_IDLE
   }
 
   return std::wstring();
 }
 
-// Called by PluginInstaller to start installation of missing plugin.
-void WebContents::InstallMissingPlugin() {
-  render_view_host()->InstallMissingPlugin();
-}
-
-void WebContents::GetAllSavableResourceLinksForCurrentPage(
-    const GURL& page_url) {
-  render_view_host()->GetAllSavableResourceLinksForCurrentPage(
-      page_url);
-}
-
-void WebContents::OnReceivedSavableResourceLinksForCurrentPage(
-    const std::vector<GURL>& resources_list,
-    const std::vector<GURL>& referrers_list,
-    const std::vector<GURL>& frames_list) {
-  SavePackage* save_package = get_save_package();
-  if (save_package) {
-    save_package->ProcessCurrentPageAllSavableResourceLinks(resources_list,
-                                                            referrers_list,
-                                                            frames_list);
-  }
-}
-
-void WebContents::GetSerializedHtmlDataForCurrentPageWithLocalLinks(
-    const std::vector<std::wstring>& links,
-    const std::vector<std::wstring>& local_paths,
-    const std::wstring& local_directory_name) {
-  render_view_host()->GetSerializedHtmlDataForCurrentPageWithLocalLinks(
-      links, local_paths, local_directory_name);
-}
-
-
-void WebContents::OnReceivedSerializedHtmlData(const GURL& frame_url,
-                                               const std::string& data,
-                                               int32 status) {
-  SavePackage* save_package = get_save_package();
-  if (save_package)
-    save_package->ProcessSerializedHtmlData(frame_url,
-                                            data,
-                                            status);
-}
-
 bool WebContents::CanBlur() const {
   return delegate() ? delegate()->CanBlur() : true;
 }
 
 void WebContents::RendererUnresponsive(RenderViewHost* rvh) {
   if (render_view_host() && render_view_host()->IsRenderViewLive())
     HungRendererWarning::ShowForWebContents(this);
 }
 
 void WebContents::RendererResponsive(RenderViewHost* render_view_host) {
@@ skipping 15 matching lines @@
 }
 
 BOOL WebContents::EnumPluginWindowsCallback(HWND window, LPARAM) {
   if (WebPluginDelegateImpl::IsPluginDelegateWindow(window)) {
     ::ShowWindow(window, SW_HIDE);
     SetParent(window, NULL);
   }
 
   return TRUE;
 }