diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 08:26:38 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 08:26:38 +0000 |
| commit | 486d05cf480ee2ca6e3d1aad639e3c4261eb9cad (patch) | |
| tree | c42c5f4b6d2e162d65eb1bddbe8fe64622940b13 | |
| parent | 12aff51ce1c9e3ac9f5f75b99aceedaee3ad21c9 (diff) | |
| download | chromium_src-486d05cf480ee2ca6e3d1aad639e3c4261eb9cad.zip chromium_src-486d05cf480ee2ca6e3d1aad639e3c4261eb9cad.tar.gz chromium_src-486d05cf480ee2ca6e3d1aad639e3c4261eb9cad.tar.bz2 | |
Merge 209751 "Implement platform_util::OpenExternal on ChromeOS"
> Implement platform_util::OpenExternal on ChromeOS
>
> And remove OS-conditional code from ChromeShellWindowDelegate.
>
> BUG=249265,256338
>
> Review URL: https://chromiumcodereview.appspot.com/18083022
TBR=satorux@chromium.org
Review URL: https://codereview.chromium.org/23376005
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@219513 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/platform_util_chromeos.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/extensions/shell_window.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc index 1d68cab..5f3e7e60 100644 --- a/chrome/browser/platform_util_chromeos.cc +++ b/chrome/browser/platform_util_chromeos.cc @@ -29,6 +29,7 @@ void OpenURL(const std::string& url) { chrome::NavigateParams params( browser, GURL(url), content::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; + params.window_action = chrome::NavigateParams::SHOW_WINDOW; chrome::Navigate(¶ms); } @@ -61,6 +62,9 @@ void OpenExternal(const GURL& url) { string_url.append(url.spec()); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(OpenURL, string_url)); + } else if (url.is_valid()) { + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, + base::Bind(OpenURL, url.spec())); } } diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc index 27e55b78..f482d08 100644 --- a/chrome/browser/ui/extensions/shell_window.cc +++ b/chrome/browser/ui/extensions/shell_window.cc @@ -317,7 +317,7 @@ void ShellWindow::AddNewContents(WebContents* source, DCHECK(Profile::FromBrowserContext(new_contents->GetBrowserContext()) == profile_); #if defined(OS_MACOSX) || defined(OS_WIN) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX)) if (disable_external_open_for_testing_) { Browser* browser = chrome::FindOrCreateTabbedBrowser(profile_, chrome::GetActiveDesktop()); |