Move more platform-specific stuff from WebContents to the view....

chrome/browser/web_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEB_CONTENTS_H_
 #define CHROME_BROWSER_WEB_CONTENTS_H_
 
 #include "base/hash_tables.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/fav_icon_helper.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/render_view_host_delegate.h"
 #include "chrome/browser/render_view_host_manager.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/tab_contents.h"
 #include "chrome/browser/web_app.h"
 
 class FindInPageController;
 class InterstitialPageDelegate;
 class PasswordManager;
 class PluginInstaller;
 class RenderViewHost;
 class RenderViewHostFactory;
 class RenderWidgetHost;
-class SadTabView;
 class WebContentsView;
 
 // WebContents represents the contents of a tab that shows web pages. It embeds
 // a RenderViewHost (via RenderViewHostManager) to actually display the page.
 class WebContents : public TabContents,
                     public RenderViewHostDelegate,
                     public RenderViewHostManager::Delegate,
                     public SelectFileDialog::Listener,
                     public NotificationObserver,
                     public WebApp::Observer {
@@ skipping 225 matching lines @@
       int error_code,
       const GURL& url,
       bool showing_repost_interstitial);
   virtual void UpdateFavIconURL(RenderViewHost* render_view_host,
                                 int32 page_id, const GURL& icon_url);
   virtual void DidDownloadImage(RenderViewHost* render_view_host,
                                 int id,
                                 const GURL& image_url,
                                 bool errored,
                                 const SkBitmap& image);
-  virtual void ShowContextMenu(const ViewHostMsg_ContextMenu_Params& params);
-  virtual void StartDragging(const WebDropData& drop_data);
-  virtual void UpdateDragCursor(bool is_drop_target);
   virtual void RequestOpenURL(const GURL& url,
                               WindowOpenDisposition disposition);
   virtual void DomOperationResponse(const std::string& json_string,
                                     int automation_id);
   virtual void ProcessExternalHostMessage(const std::string& receiver,
                                           const std::string& message);
   virtual void GoToEntryAtOffset(int offset);
   virtual void GetHistoryListCount(int* back_list_count,
                                    int* forward_list_count);
   virtual void RunFileChooser(const std::wstring& default_file);
   virtual void RunJavaScriptMessage(const std::wstring& message,
                                     const std::wstring& default_prompt,
                                     const int flags,
                                     IPC::Message* reply_msg);
   virtual void RunBeforeUnloadConfirm(const std::wstring& message,
                                       IPC::Message* reply_msg);
   virtual void ShowModalHTMLDialog(const GURL& url, int width, int height,
                                    const std::string& json_arguments,
                                    IPC::Message* reply_msg);
   virtual void PasswordFormsSeen(const std::vector<PasswordForm>& forms);
-  virtual void TakeFocus(bool reverse);
   virtual void PageHasOSDD(RenderViewHost* render_view_host,
                            int32 page_id, const GURL& url, bool autodetected);
   virtual void InspectElementReply(int num_resources);
   virtual void DidGetPrintedPagesCount(int cookie, int number_pages);
   virtual void DidPrintPage(const ViewHostMsg_DidPrintPage_Params& params);
   virtual GURL GetAlternateErrorPageURL() const;
   virtual WebPreferences GetWebkitPrefs();
   virtual void OnMissingPluginStatus(int status);
   virtual void OnCrashedPlugin(const std::wstring& plugin_path);
   virtual void OnJSOutOfMemory();
@@ skipping 10 matching lines @@
   }
   virtual bool CanBlur() const;
   virtual void RendererUnresponsive(RenderViewHost* render_view_host);
   virtual void RendererResponsive(RenderViewHost* render_view_host);
   virtual void LoadStateChanged(const GURL& url, net::LoadState load_state);
   virtual void OnDidGetApplicationInfo(
       int32 page_id,
       const webkit_glue::WebApplicationInfo& info);
   virtual void OnEnterOrSpace();
 
-  // Stupid render view host view pass-throughs.
-  virtual void HandleKeyboardEvent(const WebKeyboardEvent& event);
-
   // SelectFileDialog::Listener ------------------------------------------------
 
   virtual void FileSelected(const std::wstring& path, void* params);
   virtual void FileSelectionCanceled(void* params);
 
   // RenderViewHostManager::Delegate -------------------------------------------
 
   virtual void BeforeUnloadFiredFromRenderManager(
       bool proceed,
       bool* proceed_to_fire_unload);
@@ skipping 107 matching lines @@
   // instance's page id, the site instances page id is updated as well as the
   // renderers max page id.
   void UpdateMaxPageIDIfNecessary(SiteInstance* site_instance,
                                   RenderViewHost* rvh);
 
   // Called by OnMsgNavigate to update history state. Overridden by subclasses
   // that don't want to be added to history.
   virtual void UpdateHistoryForNavigation(const GURL& display_url,
       const ViewHostMsg_FrameNavigate_Params& params);
 
+  // Saves the given title to the navigation entry and does associated work. It
+  // will update history and the view for the new title, and also synthesize
+  // titles for file URLs that have none (so we require that the URL of the
+  // entry already be set).
+  //
+  // This is used as the backend for state updates, which include a new title,
+  // or the dedicated set title message. It returns true if the new title is
+  // different and was therefore updated.
+  bool UpdateTitleForEntry(NavigationEntry* entry, const std::wstring& title);
+
   // Misc non-view stuff -------------------------------------------------------
 
   // Helper functions for sending notifications.
   void NotifySwapped();
   void NotifyConnected();
   void NotifyDisconnected();
 
   // If params has a searchable form, this tries to create a new keyword.
   void GenerateKeywordIfNecessary(
       const ViewHostMsg_FrameNavigate_Params& params);
@@ skipping 23 matching lines @@
   GURL last_url_;
 
   // Maps from handle to page_id.
   typedef std::map<HistoryService::Handle, int32> HistoryRequestMap;
   HistoryRequestMap history_requests_;
 
   // System time at which the current load was started.
   TimeTicks current_load_start_;
 
   // Whether we have a (non-empty) title for the current page.
-  // Used to prevent subsequent title updates from affecting history.
-  bool has_page_title_;
+  // Used to prevent subsequent title updates from affecting history. This
+  // prevents some weirdness because some AJAXy apps use titles for status
+  // messages.
+  bool received_page_title_;
 
   // SavePackage, lazily created.
   scoped_refptr<SavePackage> save_package_;
 
   // Handles communication with the FindInPage popup.
   scoped_ptr<FindInPageController> find_in_page_controller_;
 
   // Tracks our pending CancelableRequests. This maps pending requests to
   // page IDs so that we know whether a given callback still applies. The
   // page ID -1 means no page ID was set.
   CancelableRequestConsumerT<int32, -1> cancelable_consumer_;
 
   // Whether the current URL is starred
   bool is_starred_;
 
   // Handle to an event that's set when the page is showing a message box (or
   // equivalent constrained window).  Plugin processes check this to know if
   // they should pump messages then.
   ScopedHandle message_box_active_;
 
   // PasswordManager, lazily created.
   scoped_ptr<PasswordManager> password_manager_;
 
   // PluginInstaller, lazily created.
   scoped_ptr<PluginInstaller> plugin_installer_;
 
-  // The SadTab renderer.
-  // TODO(brettw) move into WebContentsView*.
-  scoped_ptr<SadTabView> sad_tab_;
-
   // Handles downloading favicons.
   FavIconHelper fav_icon_helper_;
 
   // Dialog box used for choosing files to upload from file form fields.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   // The time that the last javascript message was dismissed.
   TimeTicks last_javascript_message_dismissal_;
 
   // True if the user has decided to block future javascript messages. This is
@@ skipping 13 matching lines @@
   net::LoadState load_state_;
   std::wstring load_state_host_;
 
   // Non-null if we're displaying content for a web app.
   scoped_refptr<WebApp> web_app_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContents);
 };
 
 #endif  // CHROME_BROWSER_WEB_CONTENTS_H_