diff options
| author | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 20:28:23 +0000 |
|---|---|---|
| committer | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 20:28:23 +0000 |
| commit | 40aa8bba1fa8d2e5faeb7a0f4f6ecd694a1ac2b1 (patch) | |
| tree | 5c7aee8a3426c6efa65fa254bf8a301757dc7889 /chrome/browser/chrome_content_browser_client.cc | |
| parent | 7febfe6e2d9e2f7da07c50d09c76c8eeeb651643 (diff) | |
| download | chromium_src-40aa8bba1fa8d2e5faeb7a0f4f6ecd694a1ac2b1.zip chromium_src-40aa8bba1fa8d2e5faeb7a0f4f6ecd694a1ac2b1.tar.gz chromium_src-40aa8bba1fa8d2e5faeb7a0f4f6ecd694a1ac2b1.tar.bz2 | |
Move Android to use new Popup Blocker API.
Update Android's popup implementation to use the new popup blocker API.
BUG=275700
Review URL: https://chromiumcodereview.appspot.com/23264020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 380aa2a..2d60399f 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -81,6 +81,7 @@ #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" @@ -169,10 +170,6 @@ #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 @@ -525,7 +522,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { g_io_thread_application_locale.Get() = locale; } -#if !defined(OS_ANDROID) struct BlockedPopupParams { BlockedPopupParams(const GURL& target_url, const content::Referrer& referrer, @@ -572,7 +568,6 @@ void HandleBlockedPopupOnUIThread(const BlockedPopupParams& params) { params.user_gesture, params.opener_suppressed); } -#endif } // namespace @@ -1996,7 +1991,6 @@ bool ChromeContentBrowserClient::CanCreateWindow( return false; } -#if !defined(OS_ANDROID) if (is_guest) return true; @@ -2026,7 +2020,6 @@ bool ChromeContentBrowserClient::CanCreateWindow( opener_id))); return false; } -#endif return true; } |