| Index: chrome/browser/ui/browser_navigator.h
|
| diff --git a/chrome/browser/ui/browser_navigator.h b/chrome/browser/ui/browser_navigator.h
|
| index 1a82cfe36ab9622ef07ca5e7b4ded24c386f7268..97eb93f9d5f794235b3e7e9a78b7d4eb85ae50c7 100644
|
| --- a/chrome/browser/ui/browser_navigator.h
|
| +++ b/chrome/browser/ui/browser_navigator.h
|
| @@ -35,7 +35,7 @@ namespace browser {
|
| // params.disposition = NEW_BACKGROUND_TAB;
|
| // browser::Navigate(¶ms);
|
| //
|
| -// Opens a popup TabContents:
|
| +// Opens a popup TabContentsWrapper:
|
| // browser::NavigateParams params(browser, popup_contents);
|
| // params.source_contents = source_contents;
|
| // browser::Navigate(¶ms);
|
| @@ -53,27 +53,27 @@ struct NavigateParams {
|
| GURL url;
|
| content::Referrer referrer;
|
|
|
| - // [in] A TabContents to be navigated or inserted into the target Browser's
|
| - // tabstrip. If NULL, |url| or the homepage will be used instead. When
|
| - // non-NULL, Navigate() assumes it has already been navigated to its
|
| - // intended destination and will not load any URL in it (i.e. |url| is
|
| - // ignored).
|
| + // [in] A TabContentsWrapper to be navigated or inserted into the target
|
| + // Browser's tabstrip. If NULL, |url| or the homepage will be used
|
| + // instead. When non-NULL, Navigate() assumes it has already been
|
| + // navigated to its intended destination and will not load any URL in it
|
| + // (i.e. |url| is ignored).
|
| // Default is NULL.
|
| - // [out] The TabContents in which the navigation occurred or that was
|
| + // [out] The TabContentsWrapper in which the navigation occurred or that was
|
| // inserted. Guaranteed non-NULL except for note below:
|
| // Note: If this field is set to NULL by the caller and Navigate() creates
|
| - // a new TabContents, this field will remain NULL and the TabContents
|
| - // deleted if the TabContents it created is not added to a TabStripModel
|
| - // before Navigate() returns.
|
| + // a new TabContentsWrapper, this field will remain NULL and the
|
| + // TabContentsWrapper deleted if the TabContentsWrapper it created is
|
| + // not added to a TabStripModel before Navigate() returns.
|
| TabContentsWrapper* target_contents;
|
|
|
| - // [in] The TabContents that initiated the Navigate() request if such context
|
| - // is necessary. Default is NULL, i.e. no context.
|
| - // [out] If NULL, this value will be set to the selected TabContents in the
|
| - // originating browser prior to the operation performed by Navigate().
|
| - // However, if the originating page is from a different profile (e.g. an
|
| - // OFF_THE_RECORD page originating from a non-OTR window), then
|
| - // |source_contents| is reset to NULL.
|
| + // [in] The TabContentsWrapper that initiated the Navigate() request if such
|
| + // context is necessary. Default is NULL, i.e. no context.
|
| + // [out] If NULL, this value will be set to the selected TabContentsWrapper in
|
| + // the originating browser prior to the operation performed by
|
| + // Navigate(). However, if the originating page is from a different
|
| + // profile (e.g. an OFF_THE_RECORD page originating from a non-OTR
|
| + // window), then |source_contents| is reset to NULL.
|
| TabContentsWrapper* source_contents;
|
|
|
| // The disposition requested by the navigation source. Default is
|
|
|