diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 14:00:12 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 14:00:12 +0000 |
commit | ca13a448f6b94379803a4846d0d41128b5d650f5 (patch) | |
tree | 01d2e0b3403cd9423b29892a1c021ed1516759c7 /content/public/browser | |
parent | 93425b44c4ea18ca58e3f5585d92795628bc5355 (diff) | |
download | chromium_src-ca13a448f6b94379803a4846d0d41128b5d650f5.zip chromium_src-ca13a448f6b94379803a4846d0d41128b5d650f5.tar.gz chromium_src-ca13a448f6b94379803a4846d0d41128b5d650f5.tar.bz2 |
TabContents -> WebContentsImpl, part 16
Remove "tab contents".
BUG=105875
TEST=no change
Review URL: https://chromiumcodereview.appspot.com/9956154
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/browser')
-rw-r--r-- | content/public/browser/web_contents.h | 25 | ||||
-rw-r--r-- | content/public/browser/web_contents_delegate.h | 10 | ||||
-rw-r--r-- | content/public/browser/web_contents_view.h | 4 |
3 files changed, 20 insertions, 19 deletions
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h index 89be1ca..54ba580 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -50,11 +50,12 @@ struct RendererPreferences; // Describes what goes in the main content area of a tab. class WebContents : public PageNavigator { public: - // |base_web_contents| is used if we want to size the new web contents view - // based on an existing web contents view. This can be NULL if not needed. + // |base_tab_contents| is used if we want to size the new WebContents's view + // based on the view of an existing WebContents. This can be NULL if not + // needed. // // The session storage namespace parameter allows multiple render views and - // tab contentses to share the same session storage (part of the WebStorage + // web contentses to share the same session storage (part of the WebStorage // spec) space. This is useful when restoring tabs, but most callers should // pass in NULL which will cause a new SessionStorageNamespace to be created. CONTENT_EXPORT static WebContents* Create( @@ -68,7 +69,7 @@ class WebContents : public PageNavigator { // Intrinsic tab state ------------------------------------------------------- - // Returns the property bag for this tab contents, where callers can add + // Returns the property bag for this WebContents, where callers can add // extra data they may wish to associate with the tab. Returns a pointer // rather than a reference since the PropertyAccessors expect this. virtual const base::PropertyBag* GetPropertyBag() const = 0; @@ -78,7 +79,7 @@ class WebContents : public PageNavigator { virtual WebContentsDelegate* GetDelegate() = 0; virtual void SetDelegate(WebContentsDelegate* delegate) = 0; - // Gets the controller for this tab contents. + // Gets the controller for this WebContents. virtual NavigationController& GetController() = 0; virtual const NavigationController& GetController() const = 0; @@ -143,10 +144,10 @@ class WebContents : public PageNavigator { // returns the current SiteInstance. virtual SiteInstance* GetPendingSiteInstance() const = 0; - // Return whether this tab contents is loading a resource. + // Return whether this WebContents is loading a resource. virtual bool IsLoading() const = 0; - // Returns whether this tab contents is waiting for a first-response for the + // Returns whether this WebContents is waiting for a first-response for the // main resource of the page. virtual bool IsWaitingForResponse() const = 0; @@ -166,8 +167,8 @@ class WebContents : public PageNavigator { // Internal state ------------------------------------------------------------ - // This flag indicates whether the tab contents is currently being - // screenshotted by the DraggedTabController. + // This flag indicates whether the WebContents is currently being + // screenshotted. virtual void SetCapturingContents(bool cap) = 0; // Indicates whether this tab should be considered crashed. The setter will @@ -186,12 +187,12 @@ class WebContents : public PageNavigator { // change. See InvalidateType enum. virtual void NotifyNavigationStateChanged(unsigned changed_flags) = 0; - // Invoked when the tab contents becomes selected. If you override, be sure + // Invoked when the WebContents becomes selected. If you override, be sure // and invoke super's implementation. virtual void DidBecomeSelected() = 0; virtual base::TimeTicks GetLastSelectedTime() const = 0; - // Invoked when the tab contents becomes hidden. + // Invoked when the WebContents becomes hidden. // NOTE: If you override this, call the superclass version too! virtual void WasHidden() = 0; @@ -311,7 +312,7 @@ class WebContents : public PageNavigator { virtual bool ShouldAcceptDragAndDrop() const = 0; // A render view-originated drag has ended. Informs the render view host and - // tab contents delegate. + // WebContentsDelegate. virtual void SystemDragEnded() = 0; // Indicates if this tab was explicitly closed by the user (control-w, close diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h index b99890b..6e3c15e 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -77,7 +77,7 @@ class CONTENT_EXPORT WebContentsDelegate { virtual WebContents* OpenURLFromTab(WebContents* source, const OpenURLParams& params); - // Called to inform the delegate that the tab content's navigation state + // Called to inform the delegate that the WebContents's navigation state // changed. The |changed_flags| indicates the parts of the navigation state // that have been updated, and is any combination of the // |WebContents::InvalidateTypes| bits. @@ -125,7 +125,7 @@ class CONTENT_EXPORT WebContentsDelegate { // out so it can perform any cleanup necessary. virtual void SwappedOut(WebContents* source) {} - // Request the delegate to move this tab contents to the specified position + // Request the delegate to move this WebContents to the specified position // in screen coordinates. virtual void MoveContents(WebContents* source, const gfx::Rect& pos) {} @@ -233,7 +233,7 @@ class CONTENT_EXPORT WebContentsDelegate { // Returns true if the context menu command was handled virtual bool ExecuteContextMenuCommand(int command); - // Opens source view for given tab contents that is navigated to the given + // Opens source view for given WebContents that is navigated to the given // page url. virtual void ViewSourceForTab(WebContents* source, const GURL& page_url); @@ -267,13 +267,13 @@ class CONTENT_EXPORT WebContentsDelegate { // Returns true to allow WebContents to continue with the default processing. virtual bool OnGoToEntryOffset(int offset); - // Returns whether this tab contents should add the specified navigation to + // Returns whether this WebContents should add the specified navigation to // history. virtual bool ShouldAddNavigationToHistory( const history::HistoryAddPageArgs& add_page_args, NavigationType navigation_type); - // Returns the native window framing the view containing the tab contents. + // Returns the native window framing the view containing the WebContents. virtual gfx::NativeWindow GetFrameNativeWindow(); // Allows delegate to control whether a WebContents will be created. Returns diff --git a/content/public/browser/web_contents_view.h b/content/public/browser/web_contents_view.h index d971b2e..73abdc5 100644 --- a/content/public/browser/web_contents_view.h +++ b/content/public/browser/web_contents_view.h @@ -90,7 +90,7 @@ class CONTENT_EXPORT WebContentsView // Sets focus to the native widget for this tab. virtual void Focus() = 0; - // Sets focus to the appropriate element when the tab contents is shown the + // Sets focus to the appropriate element when the WebContents is shown the // first time. virtual void SetInitialFocus() = 0; @@ -102,7 +102,7 @@ class CONTENT_EXPORT WebContentsView virtual void RestoreFocus() = 0; // If we try to close the tab while a drag is in progress, we crash. These - // methods allow the tab contents to determine if a drag is in progress and + // methods allow the WebContents to determine if a drag is in progress and // postpone the tab closing. virtual bool IsDoingDrag() const = 0; virtual void CancelDragAndCloseTab() = 0; |