diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 15:28:57 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 15:28:57 +0000 |
| commit | f3332e18f25320eaa140d36405318d46a86ce443 (patch) | |
| tree | 0d5fa00fc06aabdcbb426abe36d71862f859ea54 /chrome/browser/tab_contents/tab_contents.cc | |
| parent | 199535dd2ca0210a5c69d35e43f0432d8638f407 (diff) | |
| download | chromium_src-f3332e18f25320eaa140d36405318d46a86ce443.zip chromium_src-f3332e18f25320eaa140d36405318d46a86ce443.tar.gz chromium_src-f3332e18f25320eaa140d36405318d46a86ce443.tar.bz2 | |
Hook up popup windows on Mac (no blocking yet).
Review URL: http://codereview.chromium.org/52015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/tab_contents.cc')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index d7dacb2..d24c1cd1 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -283,6 +283,7 @@ ConstrainedWindow* TabContents::CreateConstrainedDialog( child_windows_.push_back(window); return window; } +#endif void TabContents::AddNewContents(TabContents* new_contents, WindowOpenDisposition disposition, @@ -291,6 +292,7 @@ void TabContents::AddNewContents(TabContents* new_contents, if (!delegate_) return; +#if defined(OS_WIN) if ((disposition == NEW_POPUP) && !user_gesture) { // Unrequested popups from normal pages are constrained. TabContents* popup_owner = this; @@ -306,8 +308,14 @@ void TabContents::AddNewContents(TabContents* new_contents, PopupNotificationVisibilityChanged(ShowingBlockedPopupNotification()); } +#else + // TODO(port): implement the popup blocker stuff + delegate_->AddNewContents(this, new_contents, disposition, initial_pos, + user_gesture); +#endif } +#if defined(OS_WIN) void TabContents::AddConstrainedPopup(TabContents* new_contents, const gfx::Rect& initial_pos) { if (!blocked_popups_) { |