First cut at popup blocking for Mac. Remove ifdefs in cross-platform code. Im...

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 753 matching lines @@
 #endif
 
 void TabContents::AddNewContents(TabContents* new_contents,
                                  WindowOpenDisposition disposition,
                                  const gfx::Rect& initial_pos,
                                  bool user_gesture,
                                  const GURL& creator_url) {
   if (!delegate_)
     return;
 
-#if defined(OS_WIN) || defined(OS_LINUX)
   if ((disposition == NEW_POPUP) && !user_gesture &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisablePopupBlocking)) {
     // Unrequested popups from normal pages are constrained unless they're in
     // the whitelist.  The popup owner will handle checking this.
     delegate_->GetConstrainingContents(this)->AddPopup(new_contents,
         initial_pos,
         creator_url.is_valid() ? creator_url.host() : std::string());
   } else {
     new_contents->DisassociateFromPopupCount();
     delegate_->AddNewContents(this, new_contents, disposition, initial_pos,
                               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() {
   if (blocked_popups_)
     blocked_popups_->CloseAll();
 }
 
 void TabContents::PopupNotificationVisibilityChanged(bool visible) {
   render_view_host()->PopupNotificationVisibilityChanged(visible);
 }
@@ skipping 273 matching lines @@
   NotificationType type = is_loading ? NotificationType::LOAD_START :
       NotificationType::LOAD_STOP;
   NotificationDetails det = NotificationService::NoDetails();
   if (details)
       det = Details<LoadNotificationDetails>(details);
   NotificationService::current()->Notify(type,
       Source<NavigationController>(&controller_),
       det);
 }
 
-#if defined(OS_WIN) || defined(OS_LINUX)
 void TabContents::CreateBlockedPopupContainerIfNecessary() {
   if (blocked_popups_)
     return;
 
   blocked_popups_ = BlockedPopupContainer::Create(this, profile());
 }
 
 void TabContents::AddPopup(TabContents* new_contents,
                            const gfx::Rect& initial_pos,
                            const std::string& host) {
   CreateBlockedPopupContainerIfNecessary();
   blocked_popups_->AddTabContents(new_contents, initial_pos, host);
 }
-#endif
 
 // TODO(brettw) This should be on the TabContentsView.
 void TabContents::RepositionSupressedPopupsToFit() {
   if (blocked_popups_)
     blocked_popups_->RepositionBlockedPopupContainer();
 }
 
 bool TabContents::ShowingBlockedPopupNotification() const {
   return blocked_popups_ != NULL &&
       blocked_popups_->GetBlockedPopupCount() != 0;
@@ skipping 1229 matching lines @@
       NavigationController::LoadCommittedDetails& committed_details =
           *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
       ExpireInfoBars(committed_details);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }