| Index: content/public/browser/web_contents.h
|
| diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
| index 0c0e86f7e4ef7a30e0d29c8b1c6083457b9ca5e8..54ba580665eeb5dc905ee044204f21bd4a2abbc7 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_tab_contents| is used if we want to size the new tab contents view
|
| - // based on an existing tab 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
|
|
|