| Index: chrome/browser/external_tab_container_win.cc
|
| diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
|
| index 3d88f4fbce26275a0b27807052f78b00011c1115..dc2c9f95b29fdcdc6ffba034950ce0e0adf6b9b5 100644
|
| --- a/chrome/browser/external_tab_container_win.cc
|
| +++ b/chrome/browser/external_tab_container_win.cc
|
| @@ -130,7 +130,7 @@ bool ExternalTabContainer::Init(Profile* profile,
|
| bool handle_top_level_requests,
|
| TabContentsWrapper* existing_contents,
|
| const GURL& initial_url,
|
| - const GURL& referrer,
|
| + const content::Referrer& referrer,
|
| bool infobars_enabled,
|
| bool route_all_top_level_navigations) {
|
| if (IsWindow()) {
|
| @@ -331,18 +331,6 @@ ExternalTabContainer*
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // ExternalTabContainer, TabContentsDelegate implementation:
|
|
|
| -// TODO(adriansc): Remove this method once refactoring changed all call sites.
|
| -TabContents* ExternalTabContainer::OpenURLFromTab(
|
| - TabContents* source,
|
| - const GURL& url,
|
| - const GURL& referrer,
|
| - WindowOpenDisposition disposition,
|
| - content::PageTransition transition) {
|
| - return OpenURLFromTab(source,
|
| - OpenURLParams(url, referrer, disposition, transition,
|
| - false));
|
| -}
|
| -
|
| TabContents* ExternalTabContainer::OpenURLFromTab(TabContents* source,
|
| const OpenURLParams& params) {
|
| if (pending()) {
|
| @@ -1031,7 +1019,8 @@ bool ExternalTabContainer::AcceleratorPressed(
|
| return true;
|
| }
|
|
|
| -void ExternalTabContainer::Navigate(const GURL& url, const GURL& referrer) {
|
| +void ExternalTabContainer::Navigate(const GURL& url,
|
| + const content::Referrer& referrer) {
|
| if (!tab_contents_.get()) {
|
| NOTREACHED();
|
| return;
|
| @@ -1161,14 +1150,6 @@ TemporaryPopupExternalTabContainer::~TemporaryPopupExternalTabContainer() {
|
| }
|
|
|
| TabContents* TemporaryPopupExternalTabContainer::OpenURLFromTab(
|
| - TabContents* source, const GURL& url, const GURL& referrer,
|
| - WindowOpenDisposition disposition, content::PageTransition transition) {
|
| - return OpenURLFromTab(source,
|
| - OpenURLParams(url, referrer, disposition, transition,
|
| - false));
|
| -}
|
| -
|
| -TabContents* TemporaryPopupExternalTabContainer::OpenURLFromTab(
|
| TabContents* source,
|
| const OpenURLParams& params) {
|
| if (!automation_)
|
|
|