Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Issue 29322687: Issue 2807 - MOBILE3901_2015070622_RELBRANCH merge conflicts (Closed)

July 20, 2015, 4:53 p.m. by René Jeschke
Jan. 27, 2016, 11:08 a.m.
Felix Dahlke


Issue 2807 - MOBILE3901_2015070622_RELBRANCH merge conflicts

Patch Set 1 #

Total comments: 8
Unified diffs Side-by-side diffs Delta from patch set Stats (+678 lines, -270 lines) Patch
M browser/config/version.txt View 1 chunk +1 line, -1 line 0 comments Download
M browser/themes/windows/Toolbar.png View Binary file 0 comments Download
M browser/themes/windows/Toolbar-aero.png View Binary file 0 comments Download
M browser/themes/windows/menuPanel.png View Binary file 0 comments Download
M browser/themes/windows/menuPanel-aero.png View Binary file 0 comments Download
M config/milestone.txt View 1 chunk +1 line, -1 line 0 comments Download
M docshell/base/nsAboutRedirector.cpp View 3 chunks +138 lines, -118 lines 1 comment Download
M mobile/android/app/mobile.js View 11 chunks +36 lines, -35 lines 4 comments Download
M mobile/android/base/BrowserApp.java View 61 chunks +494 lines, -112 lines 2 comments Download
M mobile/android/confvars.sh View 1 chunk +8 lines, -3 lines 1 comment Download
M security/manager/ssl/tests/unit/tlsserver/cert9.db View Binary file 0 comments Download
M security/manager/ssl/tests/unit/tlsserver/key4.db View Binary file 0 comments Download


Total messages: 3
René Jeschke
Re-uploaded, diff was applied in the wrong direction :-D
July 20, 2015, 4:54 p.m. (2015-07-20 16:54:01 UTC) #1
René Jeschke
https://codereview.adblockplus.org/29322687/diff/29322688/mobile/android/app/mobile.js File mobile/android/app/mobile.js (right): https://codereview.adblockplus.org/29322687/diff/29322688/mobile/android/app/mobile.js#newcode814 mobile/android/app/mobile.js:814: // These prefs require a restart to take effect. ...
July 20, 2015, 5:16 p.m. (2015-07-20 17:16:02 UTC) #2
Felix Dahlke
July 22, 2015, 4:19 p.m. (2015-07-22 16:19:19 UTC) #3
Looks good, can see nothing which still has to be change. A bunch of things we
need to investigate, however.

File docshell/base/nsAboutRedirector.cpp (right):

docshell/base/nsAboutRedirector.cpp:80: "memory",
We should check about:memory and about:compartments for Mozilla references.

File mobile/android/app/mobile.js (right):

mobile/android/app/mobile.js:104: pref("network.predictor.enabled", true);
I wonder if we actually want this. How I understand it, this will lead to
requests happening before the user clicks on a link - not convinced that this is
great from a privacy perspective. We should figure out what this really does.
Asking Wladimir, maybe he knows.

Which reminds me: I suggested a while ago that we keep a close eye on the
network requests happening in Adblock Browser, to ensure nothing unexpected is
happening, we should be on top of that. Can you look into that?

It'd be lovely to have automated tests for this, that load a bunch of sites and
see if any requests are happening that weren't whitelisted by the test. But for
now I guess we have to do this manually. If we explain how, our testers could do

mobile/android/app/mobile.js:180: pref("extensions.enabledScopes", 1);
Needs to be 4, but you already fixed that in a later commit. Might not hurt to
add a comment here too.

pref("extensions.adblockplus.preconfigured.suppress_first_run_page", true);
Since this one has nothing to do with Firefox, we might want to move it to the
bottom. Doesn't matter too much however, it's unlikely for upstream to set
overwrite this pref below :P

File mobile/android/base/BrowserApp.java (right):

mobile/android/base/BrowserApp.java:909: // We can't show the first run
experience until Gecko has finished initialization (bug 1077583).
lol, their term for this is even worse, "first run experience". Anyway, WE don't
need Gecko for our stuff, maybe we should trigger our stuff earlier then? Well,
doesn't have anything to do with the merge, if you agree let's tackle it in a

mobile/android/base/BrowserApp.java:2451: private void showFirstrunPager() {
Also more for the record, there's a change for re-adding our start pane under

File mobile/android/confvars.sh (right):

mobile/android/confvars.sh:74: MOZ_INSTALL_TRACKING=1
Is this going to send data to Mozilla? We should check.

Powered by Google App Engine
This is Rietveld