diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-01 15:50:51 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-01 15:50:51 +0000 |
| commit | dd716ab80774cba276e8b5eb61041f9497ddf642 (patch) | |
| tree | 1e408f488b0a8b2fb8f38481e042f1f6db12e658 /chrome/browser/tab_contents/tab_contents.cc | |
| parent | 31a9bdff16526415c4c00aba0cb41cc6654d3e69 (diff) | |
| download | chromium_src-dd716ab80774cba276e8b5eb61041f9497ddf642.zip chromium_src-dd716ab80774cba276e8b5eb61041f9497ddf642.tar.gz chromium_src-dd716ab80774cba276e8b5eb61041f9497ddf642.tar.bz2 | |
First cut at popup blocking for Mac. Remove ifdefs in cross-platform code. Implement displaying of notification, menu of popups still to come.
BUG=13160
TEST=popup notification should display and popups blocked accordingly. Can close notification widget to prevent more notifications for this tab.
Review URL: http://codereview.chromium.org/150132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19735 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, 0 insertions, 8 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index e0e6fe5..c4906ce 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -767,7 +767,6 @@ void TabContents::AddNewContents(TabContents* new_contents, if (!delegate_) return; -#if defined(OS_WIN) || defined(OS_LINUX) if ((disposition == NEW_POPUP) && !user_gesture && !CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisablePopupBlocking)) { @@ -782,11 +781,6 @@ void TabContents::AddNewContents(TabContents* new_contents, user_gesture); } PopupNotificationVisibilityChanged(ShowingBlockedPopupNotification()); -#else - // TODO(port): implement the popup blocker stuff - delegate_->AddNewContents(this, new_contents, disposition, initial_pos, - user_gesture); -#endif } void TabContents::CloseAllSuppressedPopups() { @@ -1080,7 +1074,6 @@ void TabContents::SetIsLoading(bool is_loading, det); } -#if defined(OS_WIN) || defined(OS_LINUX) void TabContents::CreateBlockedPopupContainerIfNecessary() { if (blocked_popups_) return; @@ -1094,7 +1087,6 @@ void TabContents::AddPopup(TabContents* new_contents, CreateBlockedPopupContainerIfNecessary(); blocked_popups_->AddTabContents(new_contents, initial_pos, host); } -#endif // TODO(brettw) This should be on the TabContentsView. void TabContents::RepositionSupressedPopupsToFit() { |