Move Android to use new Popup Blocker API.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 63 matching lines @@
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/search_provider_install_state_message_filter.h"
 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
 #include "chrome/browser/speech/tts_message_filter.h"
 #include "chrome/browser/ssl/ssl_add_certificate.h"
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/browser/ssl/ssl_tab_helper.h"
 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
 #include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/browser/user_style_sheet_watcher.h"
 #include "chrome/browser/user_style_sheet_watcher_factory.h"
 #include "chrome/browser/validation_message_message_filter.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 69 matching lines @@
 #include "chrome/common/descriptors_android.h"
 #elif defined(OS_POSIX)
 #include "chrome/browser/chrome_browser_main_posix.h"
 #endif
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID)
 #include "base/linux_util.h"
 #include "chrome/browser/crash_handler_host_linux.h"
 #endif
 
-#if !defined(OS_ANDROID)
-#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
-#endif
-
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "ui/base/ui_base_paths.h"
 #endif
 
 #if defined(USE_NSS)
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
@@ skipping 332 matching lines @@
   effective_url = effective_url.ReplaceComponents(replacements);
   return effective_url;
 }
 #endif
 
 void SetApplicationLocaleOnIOThread(const std::string& locale) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   g_io_thread_application_locale.Get() = locale;
 }
 
-#if !defined(OS_ANDROID)
 struct BlockedPopupParams {
   BlockedPopupParams(const GURL& target_url,
                      const content::Referrer& referrer,
                      WindowOpenDisposition disposition,
                      const WebWindowFeatures& features,
                      bool user_gesture,
                      bool opener_suppressed,
                      int render_process_id,
                      int opener_id)
       : target_url(target_url),
@@ skipping 26 matching lines @@
       PopupBlockerTabHelper::FromWebContents(tab);
   if (!popup_helper)
     return;
   popup_helper->AddBlockedPopup(params.target_url,
                                 params.referrer,
                                 params.disposition,
                                 params.features,
                                 params.user_gesture,
                                 params.opener_suppressed);
 }
-#endif
 
 }  // namespace
 
 namespace chrome {
 
 ChromeContentBrowserClient::ChromeContentBrowserClient() {
 #if defined(ENABLE_PLUGINS)
   for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
     allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
 #endif
@@ skipping 1408 matching lines @@
   }
 
   if (g_browser_process->prerender_tracker() &&
       g_browser_process->prerender_tracker()->TryCancelOnIOThread(
           render_process_id,
           opener_id,
           prerender::FINAL_STATUS_CREATE_NEW_WINDOW)) {
     return false;
   }
 
-#if !defined(OS_ANDROID)
   if (is_guest)
     return true;
 
   HostContentSettingsMap* content_settings =
       ProfileIOData::FromResourceContext(context)->GetHostContentSettingsMap();
 
   if (!user_gesture && !CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kDisablePopupBlocking)) {
     if (content_settings->GetContentSetting(opener_url,
                                             opener_url,
                                             CONTENT_SETTINGS_TYPE_POPUPS,
                                             std::string()) ==
         CONTENT_SETTING_ALLOW) {
       return true;
     }
 
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::Bind(&HandleBlockedPopupOnUIThread,
                                        BlockedPopupParams(target_url,
                                                           referrer,
                                                           disposition,
                                                           features,
                                                           user_gesture,
                                                           opener_suppressed,
                                                           render_process_id,
                                                           opener_id)));
     return false;
   }
-#endif
 
   return true;
 }
 
 std::string ChromeContentBrowserClient::GetWorkerProcessTitle(
     const GURL& url, content::ResourceContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Check if it's an extension-created worker, in which case we want to use
   // the name of the extension.
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
@@ skipping 493 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return chrome::NewCryptoModuleBlockingDialogDelegate(
       chrome::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome