Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Issue 920693003: Revert "Revert of [Android] Migrate javascript settings to a content setting from a pref. (patchset… (Closed)

Created:
5 years, 10 months ago by Ted C
Modified:
5 years, 10 months ago
Reviewers:
boliu, newt (away)
CC:
chromium-reviews, David Trainor- moved to gerrit, plundblad+watch_chromium.org, aboxhall+watch_chromium.org, avayvod+watch_chromium.org, jam, yuzo+watch_chromium.org, darin-cc_chromium.org, dmazzoni+watch_chromium.org, dtseng+watch_chromium.org, android-webview-reviews_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

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. Committed: https://crrev.com/71c96f414a12dfea865b0c89e502775ab4abbd58 Cr-Commit-Position: refs/heads/master@{#316094}

Patch Set 1 #

Patch Set 2 : Add TODO for removal #

Patch Set 3 : Remove ContentSettings from jni generation #

Patch Set 4 : Remove variable. #

Patch Set 5 : Remove jni registration #

Unified diffs Side-by-side diffs Delta from patch set Stats (+87 lines, -213 lines) Patch
M android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java View 1 chunk +5 lines, -0 lines 0 comments Download
M android_webview/java/src/org/chromium/android_webview/AwContents.java View 2 chunks +0 lines, -8 lines 0 comments Download
M android_webview/java/src/org/chromium/android_webview/AwSettings.java View 1 chunk +0 lines, -1 line 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java View 1 chunk +0 lines, -1 line 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java View 2 chunks +0 lines, -11 lines 0 comments Download
A chrome/android/java/src/org/chromium/chrome/browser/ChromeContentViewClient.java View 1 chunk +20 lines, -0 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/Tab.java View 1 chunk +1 line, -1 line 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java View 4 chunks +27 lines, -0 lines 0 comments Download
M chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellTabModelSelector.java View 2 chunks +2 lines, -1 line 0 comments Download
M chrome/browser/android/preferences/pref_service_bridge.cc View 1 chunk +21 lines, -11 lines 0 comments Download
M content/browser/android/browser_jni_registrar.cc View 1 2 3 4 2 chunks +0 lines, -2 lines 0 comments Download
D content/browser/android/content_settings.h View 1 chunk +0 lines, -37 lines 0 comments Download
D content/browser/android/content_settings.cc View 1 chunk +0 lines, -58 lines 0 comments Download
M content/content_browser.gypi View 1 chunk +0 lines, -2 lines 0 comments Download
M content/content_jni.gypi View 1 2 1 chunk +0 lines, -1 line 0 comments Download
D content/public/android/java/src/org/chromium/content/browser/ContentSettings.java View 1 chunk +0 lines, -62 lines 0 comments Download
M content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java View 1 1 chunk +9 lines, -0 lines 0 comments Download
M content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java View 1 2 3 5 chunks +1 line, -15 lines 0 comments Download
M content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java View 1 chunk +1 line, -2 lines 0 comments Download

Messages

Total messages: 10 (4 generated)
Ted C
PTAL newt - chrome/content* boliu - aw/content*
5 years, 10 months ago (2015-02-12 21:20:08 UTC) #2
newt (away)
chrome and content lgtm
5 years, 10 months ago (2015-02-12 21:34:32 UTC) #3
boliu
android_webview lgtm
5 years, 10 months ago (2015-02-12 22:12:41 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/920693003/80001
5 years, 10 months ago (2015-02-12 22:59:36 UTC) #8
commit-bot: I haz the power
Committed patchset #5 (id:80001)
5 years, 10 months ago (2015-02-13 00:13:24 UTC) #9
commit-bot: I haz the power
5 years, 10 months ago (2015-02-13 00:14:21 UTC) #10
Message was sent while issue was closed.
Patchset 5 (id:??) landed as
https://crrev.com/71c96f414a12dfea865b0c89e502775ab4abbd58
Cr-Commit-Position: refs/heads/master@{#316094}

Powered by Google App Engine
This is Rietveld 408576698