diff options
| author | rockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 15:37:39 +0000 |
|---|---|---|
| committer | rockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 15:37:39 +0000 |
| commit | 7948d6bf154eb5840281c4e5bfdf7a1e6c694003 (patch) | |
| tree | 0b8abfc455f300832eca7df6557ad301c1a0f700 | |
| parent | 5a138cd7791d78b601be3dc54390a5baf4c950a6 (diff) | |
| download | chromium_src-7948d6bf154eb5840281c4e5bfdf7a1e6c694003.zip chromium_src-7948d6bf154eb5840281c4e5bfdf7a1e6c694003.tar.gz chromium_src-7948d6bf154eb5840281c4e5bfdf7a1e6c694003.tar.bz2 | |
Merge 255212 "Activate browser window when opening new tab from ..."
Needed to merge 258854
> Activate browser window when opening new tab from a packaged app window.
>
> BUG=345598
>
> Review URL: https://codereview.chromium.org/187653006
TBR=scheib@chromium.org
Review URL: https://codereview.chromium.org/212123004
git-svn-id: svn://svn.chromium.org/chrome/branches/1847/src@259591 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/apps/chrome_app_window_delegate.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/ui/apps/chrome_app_window_delegate.cc b/chrome/browser/ui/apps/chrome_app_window_delegate.cc index 6bccd2f..3bbd9a3 100644 --- a/chrome/browser/ui/apps/chrome_app_window_delegate.cc +++ b/chrome/browser/ui/apps/chrome_app_window_delegate.cc @@ -48,9 +48,13 @@ content::WebContents* OpenURLFromTabInternal( // window. chrome::NavigateParams new_tab_params( static_cast<Browser*>(NULL), params.url, params.transition); - new_tab_params.disposition = params.disposition == NEW_BACKGROUND_TAB - ? params.disposition - : NEW_FOREGROUND_TAB; + if (params.disposition == NEW_BACKGROUND_TAB) { + new_tab_params.disposition = NEW_BACKGROUND_TAB; + } else { + new_tab_params.disposition = NEW_FOREGROUND_TAB; + new_tab_params.window_action = chrome::NavigateParams::SHOW_WINDOW; + } + new_tab_params.initiating_profile = Profile::FromBrowserContext(context); chrome::Navigate(&new_tab_params); |