diff options
author | tedchoc <tedchoc@chromium.org> | 2015-02-12 16:13:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-13 00:14:07 +0000 |
commit | 71c96f414a12dfea865b0c89e502775ab4abbd58 (patch) | |
tree | 4ea6fb3199bf8e52e2f00ba0f7d5767c98062b8c /content/content_browser.gypi | |
parent | 5b6e7aa972b5ae54aa17d3edef8341f8874a5ae1 (diff) | |
download | chromium_src-71c96f414a12dfea865b0c89e502775ab4abbd58.zip chromium_src-71c96f414a12dfea865b0c89e502775ab4abbd58.tar.gz chromium_src-71c96f414a12dfea865b0c89e502775ab4abbd58.tar.bz2 |
Revert "Revert of [Android] Migrate javascript settings to a content setting from a pref. (patchset #3 id:40001 of https://codereview.chromium.org/920583002/)"
This removes ContentSettings and exposes an embedder method for determining whether
javascript is enabled. Allowing chrome to use the now better than ever content
setting from PrefServiceBridge.
BUG=454063
This reverts commit f38a80da741a08c5bf722226a06325b784a40909.
Review URL: https://codereview.chromium.org/920693003
Cr-Commit-Position: refs/heads/master@{#316094}
Diffstat (limited to 'content/content_browser.gypi')
-rw-r--r-- | content/content_browser.gypi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index e4a1795..aede0ff 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -307,8 +307,6 @@ 'browser/android/content_protocol_handler_impl.h', 'browser/android/content_readback_handler.cc', 'browser/android/content_readback_handler.h', - 'browser/android/content_settings.cc', - 'browser/android/content_settings.h', 'browser/android/content_startup_flags.cc', 'browser/android/content_startup_flags.h', 'browser/android/content_video_view.cc', |