| Index: chrome/browser/ui/browser_tabstrip.cc
|
| diff --git a/chrome/browser/ui/browser_tabstrip.cc b/chrome/browser/ui/browser_tabstrip.cc
|
| index 995e0de1a4ecf609711db7b6108d8a513a4722cf..f75af143dbfc1f2f9756b0eb8fcc9da02db36dfe 100644
|
| --- a/chrome/browser/ui/browser_tabstrip.cc
|
| +++ b/chrome/browser/ui/browser_tabstrip.cc
|
| @@ -27,7 +27,8 @@ void AddTabAt(Browser* browser, const GURL& url, int idx, bool foreground) {
|
| chrome::NavigateParams params(browser,
|
| url.is_empty() ? GURL(chrome::kChromeUINewTabURL) : url,
|
| ui::PAGE_TRANSITION_TYPED);
|
| - params.disposition = foreground ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
|
| + params.disposition = foreground ? WindowOpenDisposition::NEW_FOREGROUND_TAB
|
| + : WindowOpenDisposition::NEW_BACKGROUND_TAB;
|
| params.tabstrip_index = idx;
|
| chrome::Navigate(¶ms);
|
| CoreTabHelper* core_tab_helper =
|
| @@ -40,7 +41,7 @@ content::WebContents* AddSelectedTabWithURL(
|
| const GURL& url,
|
| ui::PageTransition transition) {
|
| NavigateParams params(browser, url, transition);
|
| - params.disposition = NEW_FOREGROUND_TAB;
|
| + params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
|
| Navigate(¶ms);
|
| return params.target_contents;
|
| }
|
| @@ -53,9 +54,9 @@ void AddWebContents(Browser* browser,
|
| bool user_gesture,
|
| bool* was_blocked) {
|
| // No code for this yet.
|
| - DCHECK(disposition != SAVE_TO_DISK);
|
| + DCHECK(disposition != WindowOpenDisposition::SAVE_TO_DISK);
|
| // Can't create a new contents for the current tab - invalid case.
|
| - DCHECK(disposition != CURRENT_TAB);
|
| + DCHECK(disposition != WindowOpenDisposition::CURRENT_TAB);
|
|
|
| NavigateParams params(browser, new_contents);
|
| params.source_contents = source_contents;
|
|
|