TabContents -> WebContentsImpl, part 21.

chrome/browser/ui/browser.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 430 matching lines @@
   // Returns true if the tab strip is editable (for extensions).
   bool IsTabStripEditable() const;
 
   // Returns the index to insert a tab at during session restore and startup.
   // |relative_index| gives the index of the url into the number of tabs that
   // are going to be opened. For example, if three urls are passed in on the
   // command line this is invoked three times with the values 0, 1 and 2.
   int GetIndexForInsertionDuringRestore(int relative_index);
 
   // Adds a selected tab with the specified URL and transition, returns the
-  // created TabContents.
+  // created TabContentsWrapper.
   TabContentsWrapper* AddSelectedTabWithURL(
       const GURL& url,
       content::PageTransition transition);
 
-  // Add a new tab, given a TabContents. A TabContents appropriate to
+  // Add a new tab, given a TabContentsWrapper. A WebContents appropriate to
   // display the last committed entry is created and returned.
   content::WebContents* AddTab(TabContentsWrapper* tab_contents,
                                content::PageTransition type);
 
   // Add a tab with its session history restored from the SessionRestore
   // system. If select is true, the tab is selected. |tab_index| gives the index
   // to insert the tab at. |selected_navigation| is the index of the
   // TabNavigation in |navigations| to select. If |extension_app_id| is
   // non-empty the tab is an app tab and |extension_app_id| is the id of the
   // extension. If |pin| is true and |tab_index|/ is the last pinned tab, then
@@ skipping 343 matching lines @@
 
   // Overridden from CommandUpdater::CommandUpdaterDelegate:
   virtual void ExecuteCommandWithDisposition(
       int id,
       WindowOpenDisposition disposition) OVERRIDE;
 
   // Overridden from TabRestoreServiceObserver:
   virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE;
   virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE;
 
-  // Centralized method for creating a TabContents, configuring and installing
-  // all its supporting objects and observers.
+  // Centralized method for creating a TabContentsWrapper, configuring and
+  // installing all its supporting objects and observers.
   static TabContentsWrapper* TabContentsFactory(
       Profile* profile,
       content::SiteInstance* site_instance,
       int routing_id,
       const content::WebContents* base_web_contents,
       content::SessionStorageNamespace* session_storage_namespace);
 
   // Overridden from TabHandlerDelegate:
   virtual Profile* GetProfile() const OVERRIDE;
   virtual Browser* AsBrowser() OVERRIDE;
 
   // Overridden from TabStripModelDelegate:
   virtual TabContentsWrapper* AddBlankTab(bool foreground);
   virtual TabContentsWrapper* AddBlankTabAt(int index, bool foreground);
   virtual Browser* CreateNewStripWithContents(
       TabContentsWrapper* detached_contents,
       const gfx::Rect& window_bounds,
       const DockInfo& dock_info,
       bool maximize);
   virtual int GetDragActions() const;
-  // Construct a TabContents for a given URL, profile and transition type.
-  // If instance is not null, its process will be used to render the tab.
+  // Construct a TabContentsWrapper for a given URL, profile and transition
+  // type. If instance is not null, its process will be used to render the tab.
   virtual TabContentsWrapper* CreateTabContentsForURL(
       const GURL& url,
       const content::Referrer& referrer,
       Profile* profile,
       content::PageTransition transition,
       bool defer_load,
       content::SiteInstance* instance) const;
   virtual bool CanDuplicateContentsAt(int index);
   virtual void DuplicateContentsAt(int index);
   virtual void CloseFrameAfterDragSession();
@@ skipping 328 matching lines @@
   // Updates the printing command state.
   void UpdatePrintingState(int content_restrictions);
 
   // Updates the save-page-as command state.
   void UpdateSaveAsState(int content_restrictions);
 
   // Updates the open-file state (Mac Only).
   void UpdateOpenFileState();
 
   // Ask the Reload/Stop button to change its icon, and update the Stop command
-  // state.  |is_loading| is true if the current TabContents is loading.
+  // state.  |is_loading| is true if the current WebContents is loading.
   // |force| is true if the button should change its icon immediately.
   void UpdateReloadStopState(bool is_loading, bool force);
 
   // UI update coalescing and handling ////////////////////////////////////////
 
   // Asks the toolbar (and as such the location bar) to update its state to
   // reflect the current tab's current URL, security state, etc.
   // If |should_restore_state| is true, we're switching (back?) to this tab and
   // should restore any previous location bar state (such as user editing) as
   // well.
@@ skipping 190 matching lines @@
   // across sessions.
   const SessionID session_id_;
 
   // The model for the toolbar view.
   scoped_ptr<ToolbarModel> toolbar_model_;
 
   // UI update coalescing and handling ////////////////////////////////////////
 
   typedef std::map<const content::WebContents*, int> UpdateMap;
 
-  // Maps from TabContents to pending UI updates that need to be processed.
+  // Maps from WebContents to pending UI updates that need to be processed.
   // We don't update things like the URL or tab title right away to avoid
   // flickering and extra painting.
   // See ScheduleUIUpdate and ProcessPendingUIUpdates.
   UpdateMap scheduled_updates_;
 
   // The following factory is used for chrome update coalescing.
   base::WeakPtrFactory<Browser> chrome_updater_factory_;
 
   // OnBeforeUnload handling //////////////////////////////////////////////////
 
@@ skipping 60 matching lines @@
 
   // Different types of action when web app info is available.
   // OnDidGetApplicationInfo uses this to dispatch calls.
   enum WebAppAction {
     NONE,             // No action at all.
     CREATE_SHORTCUT,  // Bring up create application shortcut dialog.
     UPDATE_SHORTCUT   // Update icon for app shortcut.
   };
 
   // Which deferred action to perform when OnDidGetApplicationInfo is notified
-  // from a TabContents. Currently, only one pending action is allowed.
+  // from a WebContents. Currently, only one pending action is allowed.
   WebAppAction pending_web_app_action_;
 
   // The profile's tab restore service. The service is owned by the profile,
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
   // Helper which implements the ContentSettingBubbleModel interface.
   scoped_ptr<BrowserContentSettingBubbleModelDelegate>
       content_setting_bubble_model_delegate_;
 
@@ skipping 19 matching lines @@
   bool window_has_shown_;
 
   // Currently open color chooser. Non-NULL after OpenColorChooser is called and
   // before DidEndColorChooser is called.
   scoped_ptr<content::ColorChooser> color_chooser_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_