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

Side by Side Diff: lib/child/utils.js

Issue 29329554: Issue 3208 - Send Private Browsing flag separately from the frame structure (Closed)
Patch Set: Fixed PrivateBrowsingUtils call Created Nov. 2, 2015, 6:52 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « lib/child/elemHide.js ('k') | lib/elemHide.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 21 matching lines...) Expand all
32 { 32 {
33 let frame = { 33 let frame = {
34 location: window.location.href, 34 location: window.location.href,
35 sitekey: null 35 sitekey: null
36 }; 36 };
37 37
38 let documentElement = window.document && window.document.documentElement; 38 let documentElement = window.document && window.document.documentElement;
39 if (documentElement) 39 if (documentElement)
40 frame.sitekey = documentElement.getAttribute("data-adblockkey") 40 frame.sitekey = documentElement.getAttribute("data-adblockkey")
41 41
42 if (window == window.parent)
43 frame.privateBrowsing = PrivateBrowsingUtils.isWindowPrivate(window);
44
45 frames.push(frame); 42 frames.push(frame);
46 window = (window != window.parent ? window.parent : null); 43 window = (window != window.parent ? window.parent : null);
47 } 44 }
48 return frames; 45 return frames;
49 } 46 };
47
48 /**
49 * Checks whether Private Browsing mode is enabled for a content window.
50 * @return {Boolean}
51 */
52 let isPrivate = exports.isPrivate = function(/**Window*/ window)
53 {
54 return PrivateBrowsingUtils.isContentWindowPrivate(window);
55 };
OLDNEW
« no previous file with comments | « lib/child/elemHide.js ('k') | lib/elemHide.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld