Partial work for Chromium 47

File reorganization
Change license to GPLv3
Blindly added all latest patches from Iridium Browser as of a9b882b2af95cfd925c74270af697977a393a4b9 (patchview branch)
Blindly added all latest patches from Inox patchset as of 45554189cf010da92b9e8ff8289e60caa889c587
Updated README.md
This commit is contained in:
Eloston
2015-12-03 23:08:01 -08:00
parent 22e1f0621d
commit 27f62c91a1
136 changed files with 14152 additions and 17 deletions

674
LICENSE Normal file
View File

@@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

View File

@@ -13,9 +13,29 @@
- Disabled persistent per-site settings in Preferences file
- Disabled extension autoupdating
## Patches
Patches are stored in the `patches` directory, with the exception of system-dependant patches (these are in the `build_templates` directory).
Here's some information on what's in the `patches` directory:
* `ungoogled-chromium/`
* This directory contains new patches for ungoogled-chromium
* `iridium-browser`
* This directory contains patches from Iridium Browser.
* Patches are from the `patchview` branch of its Git repository. [Web view of the patchview branch](https://git.iridiumbrowser.de/cgit.cgi/iridium-browser/?h=patchview)
* `inox-patchset/`
* This directory contains patches from Inox patchset.
* Patches are from [inox-patchset's GitHub](https://github.com/gcarq/inox-patchset)
* [Inox patchset's license](https://github.com/gcarq/inox-patchset/blob/master/LICENSE)
* `debian/`
* This directory contains patches from Debian's Chromium.
* These patches are not Debian-specific. For those, see the `build-templates/debian/` directory
* `patch_order`
* Determines which patches are used and what order they should be applied
## Building
Right now, only Debian build scripts are provided. Windows build scripts will be added in the future.
Right now, only Debian build scripts are provided.
### Debian and derivatives
**NOTE:** Tested on Debian Stretch 64-bit
@@ -29,15 +49,31 @@ Debian packages will appear under ungoogled-chromium/build-sandbox/
## TODO
- Move TODO list to the Issue Tracker
- Strip binaries from source package
- Fix updating extensions via clicking "Update extensions now" (NOTE: network capture shows no attempted communication after clicking the button)
- Remove attempted communication with `www.95stat1c.qjz9zk` on startup
- Add Windows support
- Add settings menu to manually edit password database(?)
- Add Windows support
## Contributing
ungoogled-chromium is undergoing major changes for Chromium 47
Use the [Issue Tracker](/Eloston/ungoogled-chromium/issues) for problems, suggestions, and questions.
You may also contribute by submitting pull requests.
## Credits
Debian for build scripts <br />
[Iridium Browser](https://iridiumbrowser.de/)
[Inox patchset](https://github.com/gcarq/inox-patchset)
Debian for build scripts
Google for Chromium
## License
Public domain
GPLv3. See [LICENSE](LICENSE)

View File

@@ -1,13 +0,0 @@
#!/bin/bash
BUILD_SANDBOX_PATH=$(dirname $0)/build-sandbox
pushd $BUILD_SANDBOX_PATH
rm -r debian
cp $(dirname $0)/debian ./
./debian/rules download-source
dpkg-buildpackage -b -uc
popd $BUILD_SANDBOX_PATH

View File

@@ -1,3 +1,10 @@
chromium-browser (45.0.2454.102-1) stretch; urgency=low
* New upstream version
- Based off of Debian's 45.0.2454.101-1
-- Eloston <eloston@mail.com> Sat, 03 Oct 2015 00:00:00 +0000
chromium-browser (45.0.2454.94-1) stretch; urgency=low
* New upstream version

17
generate_debian.sh Executable file
View File

@@ -0,0 +1,17 @@
#!/bin/bash
SCRIPT_DIR=$(dirname $(readlink -f $0))
BUILD_SANDBOX_PATH=$SCRIPT_DIR/build-sandbox
OLD_DIR=$(pwd)
mkdir $BUILD_SANDBOX_PATH
cd $BUILD_SANDBOX_PATH
rm -r debian
cp -r $SCRIPT_DIR/debian ./
./debian/rules download-source
dpkg-buildpackage -b -uc
cd $OLD_DIR

View File

@@ -0,0 +1,585 @@
--- ./components/search_engines/prepopulated_engines.json
+++ ./components/search_engines/prepopulated_engines.json.new
@@ -36,6 +36,17 @@
// The following engines are included in country lists and are added to the
// list of search engines on the first run depending on user's country.
"elements": {
+ "duckduckgo": {
+ "name": "DuckDuckGo",
+ "keyword": "duckduckgo.com",
+ "favicon_url": "https://duckduckgo.com/favicon.ico",
+ "search_url": "https://duckduckgo.com/?q={searchTerms}",
+ "suggest_url": "https://duckduckgo.com/?q={searchTerms}&language={language}&kac=1",
+ "new_tab_url": "about:blank",
+ "type": "SEARCH_ENGINE_DUCKDUCKGO",
+ "id": 11
+ },
+
"aol": {
"name": "AOL",
"keyword": "aol.com",
--- ./components/search_engines/search_engine_type.h
+++ ./components/search_engines/search_engine_type.h.new
@@ -58,6 +58,7 @@ enum SearchEngineType {
SEARCH_ENGINE_YAHOO,
SEARCH_ENGINE_YANDEX,
SEARCH_ENGINE_ZOZNAM,
+ SEARCH_ENGINE_DUCKDUCKGO,
SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro.
};
--- ./components/search_engines/template_url_prepopulate_data.cc
+++ ./components/search_engines/template_url_prepopulate_data.cc.new
@@ -49,441 +49,441 @@ namespace {
// Default (for countries with no better engine set)
const PrepopulatedEngine* engines_default[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// United Arab Emirates
const PrepopulatedEngine* engines_AE[] =
- { &google, &yahoo_maktoob, &bing, };
+ { &duckduckgo, &google, &yahoo_maktoob, &bing, };
// Albania
const PrepopulatedEngine* engines_AL[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Argentina
const PrepopulatedEngine* engines_AR[] =
- { &google, &bing, &yahoo_ar, };
+ { &duckduckgo, &google, &bing, &yahoo_ar, };
// Austria
const PrepopulatedEngine* engines_AT[] =
- { &google, &bing, &yahoo_at, };
+ { &duckduckgo, &google, &bing, &yahoo_at, };
// Australia
const PrepopulatedEngine* engines_AU[] =
- { &google, &bing, &yahoo_au, };
+ { &duckduckgo, &google, &bing, &yahoo_au, };
// Bosnia and Herzegovina
const PrepopulatedEngine* engines_BA[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Belgium
const PrepopulatedEngine* engines_BE[] =
- { &google, &bing, &yahoo, &yahoo_fr, };
+ { &duckduckgo, &google, &bing, &yahoo, &yahoo_fr, };
// Bulgaria
const PrepopulatedEngine* engines_BG[] =
- { &google, &bing, &ask, };
+ { &duckduckgo, &google, &bing, &ask, };
// Bahrain
const PrepopulatedEngine* engines_BH[] =
- { &google, &yahoo_maktoob, &bing, };
+ { &duckduckgo, &google, &yahoo_maktoob, &bing, };
// Burundi
const PrepopulatedEngine* engines_BI[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Brunei
const PrepopulatedEngine* engines_BN[] =
- { &google, &yahoo_my, &bing, };
+ { &duckduckgo, &google, &yahoo_my, &bing, };
// Bolivia
const PrepopulatedEngine* engines_BO[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Brazil
const PrepopulatedEngine* engines_BR[] =
- { &google, &ask_br, &bing, &yahoo_br, };
+ { &duckduckgo, &google, &ask_br, &bing, &yahoo_br, };
// Belarus
const PrepopulatedEngine* engines_BY[] =
- { &google, &yahoo_ru, &bing, };
+ { &duckduckgo, &google, &yahoo_ru, &bing, };
// Belize
const PrepopulatedEngine* engines_BZ[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Canada
const PrepopulatedEngine* engines_CA[] =
- { &google, &bing, &ask, &yahoo_ca, &yahoo_qc, };
+ { &duckduckgo, &google, &bing, &ask, &yahoo_ca, &yahoo_qc, };
// Switzerland
const PrepopulatedEngine* engines_CH[] =
- { &google, &bing, &yahoo_ch, };
+ { &duckduckgo, &google, &bing, &yahoo_ch, };
// Chile
const PrepopulatedEngine* engines_CL[] =
- { &google, &bing, &yahoo_cl, };
+ { &duckduckgo, &google, &bing, &yahoo_cl, };
// China
const PrepopulatedEngine* engines_CN[] =
- { &google, &baidu, &sogou, };
+ { &duckduckgo, &google, &baidu, &sogou, };
// Colombia
const PrepopulatedEngine* engines_CO[] =
- { &google, &bing, &yahoo_co, };
+ { &duckduckgo, &google, &bing, &yahoo_co, };
// Costa Rica
const PrepopulatedEngine* engines_CR[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Czech Republic
const PrepopulatedEngine* engines_CZ[] =
- { &google, &seznam, &bing, };
+ { &duckduckgo, &google, &seznam, &bing, };
// Germany
const PrepopulatedEngine* engines_DE[] =
- { &google, &bing, &yahoo_de };
+ { &duckduckgo, &google, &bing, &yahoo_de };
// Denmark
const PrepopulatedEngine* engines_DK[] =
- { &google, &bing, &yahoo_dk, };
+ { &duckduckgo, &google, &bing, &yahoo_dk, };
// Dominican Republic
const PrepopulatedEngine* engines_DO[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Algeria
const PrepopulatedEngine* engines_DZ[] =
- { &google, &bing, &yahoo_maktoob, };
+ { &duckduckgo, &google, &bing, &yahoo_maktoob, };
// Ecuador
const PrepopulatedEngine* engines_EC[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Estonia
const PrepopulatedEngine* engines_EE[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Egypt
const PrepopulatedEngine* engines_EG[] =
- { &google, &yahoo_maktoob, &bing, };
+ { &duckduckgo, &google, &yahoo_maktoob, &bing, };
// Spain
const PrepopulatedEngine* engines_ES[] =
- { &google, &bing, &yahoo_es, };
+ { &duckduckgo, &google, &bing, &yahoo_es, };
// Faroe Islands
const PrepopulatedEngine* engines_FO[] =
- { &google, &bing, &ask, };
+ { &duckduckgo, &google, &bing, &ask, };
// Finland
const PrepopulatedEngine* engines_FI[] =
- { &google, &bing, &yahoo_fi, };
+ { &duckduckgo, &google, &bing, &yahoo_fi, };
// France
const PrepopulatedEngine* engines_FR[] =
- { &google, &bing, &yahoo_fr, };
+ { &duckduckgo, &google, &bing, &yahoo_fr, };
// United Kingdom
const PrepopulatedEngine* engines_GB[] =
- { &google, &bing, &yahoo_uk, &ask_uk, };
+ { &duckduckgo, &google, &bing, &yahoo_uk, &ask_uk, };
// Greece
const PrepopulatedEngine* engines_GR[] =
- { &google, &bing, &yahoo_gr, };
+ { &duckduckgo, &google, &bing, &yahoo_gr, };
// Guatemala
const PrepopulatedEngine* engines_GT[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Hong Kong
const PrepopulatedEngine* engines_HK[] =
- { &google, &yahoo_hk, &baidu, &bing, };
+ { &duckduckgo, &google, &yahoo_hk, &baidu, &bing, };
// Honduras
const PrepopulatedEngine* engines_HN[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Croatia
const PrepopulatedEngine* engines_HR[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Hungary
const PrepopulatedEngine* engines_HU[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Indonesia
const PrepopulatedEngine* engines_ID[] =
- { &google, &yahoo_id, &bing, };
+ { &duckduckgo, &google, &yahoo_id, &bing, };
// Ireland
const PrepopulatedEngine* engines_IE[] =
- { &google, &bing, &yahoo_uk, };
+ { &duckduckgo, &google, &bing, &yahoo_uk, };
// Israel
const PrepopulatedEngine* engines_IL[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// India
const PrepopulatedEngine* engines_IN[] =
- { &google, &bing, &yahoo_in, };
+ { &duckduckgo, &google, &bing, &yahoo_in, };
// Iraq
const PrepopulatedEngine* engines_IQ[] =
- { &google, &yahoo_maktoob, &bing, };
+ { &duckduckgo, &google, &yahoo_maktoob, &bing, };
// Iran
const PrepopulatedEngine* engines_IR[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Iceland
const PrepopulatedEngine* engines_IS[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Italy
const PrepopulatedEngine* engines_IT[] =
- { &google, &virgilio, &bing, };
+ { &duckduckgo, &google, &virgilio, &bing, };
// Jamaica
const PrepopulatedEngine* engines_JM[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Jordan
const PrepopulatedEngine* engines_JO[] =
- { &google, &yahoo_maktoob, &bing, };
+ { &duckduckgo, &google, &yahoo_maktoob, &bing, };
// Japan
const PrepopulatedEngine* engines_JP[] =
- { &google, &yahoo_jp, &bing, };
+ { &duckduckgo, &google, &yahoo_jp, &bing, };
// Kenya
const PrepopulatedEngine* engines_KE[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Kuwait
const PrepopulatedEngine* engines_KW[] =
- { &google, &yahoo_maktoob, &bing, };
+ { &duckduckgo, &google, &yahoo_maktoob, &bing, };
// South Korea
const PrepopulatedEngine* engines_KR[] =
- { &google, &naver, &daum, };
+ { &duckduckgo, &google, &naver, &daum, };
// Kazakhstan
const PrepopulatedEngine* engines_KZ[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Lebanon
const PrepopulatedEngine* engines_LB[] =
- { &google, &yahoo_maktoob, &bing, };
+ { &duckduckgo, &google, &yahoo_maktoob, &bing, };
// Liechtenstein
const PrepopulatedEngine* engines_LI[] =
- { &google, &bing, &yahoo_de, };
+ { &duckduckgo, &google, &bing, &yahoo_de, };
// Lithuania
const PrepopulatedEngine* engines_LT[] =
- { &google, &bing, &yandex_ru, };
+ { &duckduckgo, &google, &bing, &yandex_ru, };
// Luxembourg
const PrepopulatedEngine* engines_LU[] =
- { &google, &bing, &yahoo_fr, };
+ { &duckduckgo, &google, &bing, &yahoo_fr, };
// Latvia
const PrepopulatedEngine* engines_LV[] =
- { &google, &yandex_ru, &bing, };
+ { &duckduckgo, &google, &yandex_ru, &bing, };
// Libya
const PrepopulatedEngine* engines_LY[] =
- { &google, &yahoo_maktoob, &bing, };
+ { &duckduckgo, &google, &yahoo_maktoob, &bing, };
// Morocco
const PrepopulatedEngine* engines_MA[] =
- { &google, &bing, &yahoo_maktoob, };
+ { &duckduckgo, &google, &bing, &yahoo_maktoob, };
// Monaco
const PrepopulatedEngine* engines_MC[] =
- { &google, &yahoo_fr, &bing, };
+ { &duckduckgo, &google, &yahoo_fr, &bing, };
// Moldova
const PrepopulatedEngine* engines_MD[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Montenegro
const PrepopulatedEngine* engines_ME[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Macedonia
const PrepopulatedEngine* engines_MK[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Mexico
const PrepopulatedEngine* engines_MX[] =
- { &google, &bing, &yahoo_mx, };
+ { &duckduckgo, &google, &bing, &yahoo_mx, };
// Malaysia
const PrepopulatedEngine* engines_MY[] =
- { &google, &yahoo_my, &bing, };
+ { &duckduckgo, &google, &yahoo_my, &bing, };
// Nicaragua
const PrepopulatedEngine* engines_NI[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Netherlands
const PrepopulatedEngine* engines_NL[] =
- { &google, &yahoo_nl, &vinden, };
+ { &duckduckgo, &google, &yahoo_nl, &vinden, };
// Norway
const PrepopulatedEngine* engines_NO[] =
- { &google, &bing, &kvasir, };
+ { &duckduckgo, &google, &bing, &kvasir, };
// New Zealand
const PrepopulatedEngine* engines_NZ[] =
- { &google, &bing, &yahoo_nz, };
+ { &duckduckgo, &google, &bing, &yahoo_nz, };
// Oman
const PrepopulatedEngine* engines_OM[] =
- { &google, &bing, &yahoo_maktoob, };
+ { &duckduckgo, &google, &bing, &yahoo_maktoob, };
// Panama
const PrepopulatedEngine* engines_PA[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Peru
const PrepopulatedEngine* engines_PE[] =
- { &google, &bing, &yahoo_pe, };
+ { &duckduckgo, &google, &bing, &yahoo_pe, };
// Philippines
const PrepopulatedEngine* engines_PH[] =
- { &google, &yahoo_ph, &bing, };
+ { &duckduckgo, &google, &yahoo_ph, &bing, };
// Pakistan
const PrepopulatedEngine* engines_PK[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Puerto Rico
const PrepopulatedEngine* engines_PR[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Poland
const PrepopulatedEngine* engines_PL[] =
- { &google, &onet, &bing, };
+ { &duckduckgo, &google, &onet, &bing, };
// Portugal
const PrepopulatedEngine* engines_PT[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Paraguay
const PrepopulatedEngine* engines_PY[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Qatar
const PrepopulatedEngine* engines_QA[] =
- { &google, &yahoo_maktoob, &bing, };
+ { &duckduckgo, &google, &yahoo_maktoob, &bing, };
// Romania
const PrepopulatedEngine* engines_RO[] =
- { &google, &yahoo_ro, &bing, };
+ { &duckduckgo, &google, &yahoo_ro, &bing, };
// Serbia
const PrepopulatedEngine* engines_RS[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Russia
const PrepopulatedEngine* engines_RU[] =
- { &google, &yandex_ru, &mail_ru, };
+ { &duckduckgo, &google, &yandex_ru, &mail_ru, };
// Rwanda
const PrepopulatedEngine* engines_RW[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Saudi Arabia
const PrepopulatedEngine* engines_SA[] =
- { &google, &yahoo_maktoob, &bing, };
+ { &duckduckgo, &google, &yahoo_maktoob, &bing, };
// Sweden
const PrepopulatedEngine* engines_SE[] =
- { &google, &bing, &yahoo_se, };
+ { &duckduckgo, &google, &bing, &yahoo_se, };
// Singapore
const PrepopulatedEngine* engines_SG[] =
- { &google, &yahoo_sg, &bing, };
+ { &duckduckgo, &google, &yahoo_sg, &bing, };
// Slovenia
const PrepopulatedEngine* engines_SI[] =
- { &google, &najdi, &ask, };
+ { &duckduckgo, &google, &najdi, &ask, };
// Slovakia
const PrepopulatedEngine* engines_SK[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// El Salvador
const PrepopulatedEngine* engines_SV[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Syria
const PrepopulatedEngine* engines_SY[] =
- { &google, &bing, &yahoo_maktoob, };
+ { &duckduckgo, &google, &bing, &yahoo_maktoob, };
// Thailand
const PrepopulatedEngine* engines_TH[] =
- { &google, &yahoo_th, &bing, };
+ { &duckduckgo, &google, &yahoo_th, &bing, };
// Tunisia
const PrepopulatedEngine* engines_TN[] =
- { &google, &bing, &yahoo_maktoob, };
+ { &duckduckgo, &google, &bing, &yahoo_maktoob, };
// Turkey
const PrepopulatedEngine* engines_TR[] =
- { &google, &bing, &yahoo_tr, &yandex_tr, };
+ { &duckduckgo, &google, &bing, &yahoo_tr, &yandex_tr, };
// Trinidad and Tobago
const PrepopulatedEngine* engines_TT[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Taiwan
const PrepopulatedEngine* engines_TW[] =
- { &google, &yahoo_tw, &bing, };
+ { &duckduckgo, &google, &yahoo_tw, &bing, };
// Tanzania
const PrepopulatedEngine* engines_TZ[] =
- { &google, &yahoo, &bing, };
+ { &duckduckgo, &google, &yahoo, &bing, };
// Ukraine
const PrepopulatedEngine* engines_UA[] =
- { &google, &yandex_ua, &bing, };
+ { &duckduckgo, &google, &yandex_ua, &bing, };
// United States
const PrepopulatedEngine* engines_US[] =
- { &google, &bing, &yahoo, &aol, &ask, };
+ { &duckduckgo, &google, &bing, &yahoo, &aol, &ask, };
// Uruguay
const PrepopulatedEngine* engines_UY[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Venezuela
const PrepopulatedEngine* engines_VE[] =
- { &google, &bing, &yahoo_ve, };
+ { &duckduckgo, &google, &bing, &yahoo_ve, };
// Vietnam
const PrepopulatedEngine* engines_VN[] =
- { &google, &yahoo_vn, &bing, };
+ { &duckduckgo, &google, &yahoo_vn, &bing, };
// Yemen
const PrepopulatedEngine* engines_YE[] =
- { &google, &bing, &yahoo_maktoob, };
+ { &duckduckgo, &google, &bing, &yahoo_maktoob, };
// South Africa
const PrepopulatedEngine* engines_ZA[] =
- { &google, &bing, &yahoo, };
+ { &duckduckgo, &google, &bing, &yahoo, };
// Zimbabwe
const PrepopulatedEngine* engines_ZW[] =
- { &google, &bing, &yahoo, &ask, };
+ { &duckduckgo, &google, &bing, &yahoo, &ask, };
// A list of all the engines that we know about.
const PrepopulatedEngine* kAllEngines[] = {
// Prepopulated engines:
&aol, &ask, &ask_br, &ask_uk, &baidu,
- &bing, &daum, &google, &kvasir, &mail_ru,
+ &bing, &daum,&duckduckgo,&google, &kvasir, &mail_ru,
&najdi, &naver, &onet, &seznam, &sogou,
&vinden, &virgilio, &yahoo, &yahoo_ar, &yahoo_at,
&yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch, &yahoo_cl,

View File

@@ -0,0 +1,125 @@
--- ./chrome/common/chrome_paths_linux.cc
+++ ./chrome/common/chrome_paths_linux.cc.new
@@ -64,11 +64,7 @@
base::FilePath config_dir(GetXDGDirectory(env.get(),
kXdgConfigHomeEnvVar,
kDotConfigDir));
-#if defined(GOOGLE_CHROME_BUILD)
- *result = config_dir.Append("google-chrome");
-#else
- *result = config_dir.Append("chromium");
-#endif
+ *result = config_dir.Append("inox");
return true;
}
--- ./chrome/app/chromium_strings.grd
+++ ./chrome/app/chromium_strings.grd.new
@@ -215,17 +215,17 @@ be available for now. -->
Disconnecting <ph name="USERNAME">$1<ex>someone@example.com</ex></ph> will clear your history, bookmarks, settings, and other Chromium data stored on this device. Data stored in your Google Account will not be cleared and can be managed on <ph name="GOOGLE_DASHBOARD_LINK">&lt;a target="_blank" href="$2"&gt;</ph>Google Dashboard<ph name="END_GOOGLE_DASHBOARD_LINK">&lt;/a&gt;</ph>.
</message>
<message name="IDS_PRODUCT_NAME" desc="The Chrome application name">
- Chromium
+ Inox
</message>
<message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name.">
- Chromium
+ Inox
</message>
<if expr="is_win">
<message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome short cut name for SxS channel">
- Chromium
+ Inox
</message>
<message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description">
- Chromium is a web browser that runs webpages and applications with lightning speed. It's fast, stable, and easy to use. Browse the web more safely with malware and phishing protection built into Chromium.
+ Inox is a free, open, and libre browser modification of the Chromium code base, with privacy being enhanced in several key areas. Automatic transmission of partial queries, keywords, metrics to central services inhibited and only occurs with consent. In addition, all our builds are reproducible, and modifications are auditable, setting the project ahead of other secure browser providers.
</message>
</if>
<if expr="chromeos">
@@ -241,7 +241,7 @@ be available for now. -->
Chromium App Launcher
</message>
<message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries application name">
- Chromium Binaries
+ Inox Binaries
</message>
<message name="IDS_CHROME_FRAME_TURNDOWN_LEARN_MORE_URL" desc="Link to knowledge-base article about Chromium Frame's turndown">
https://support.google.com/chrome/?p=ib_chromeframe
@@ -272,17 +272,17 @@ be available for now. -->
</message>
</if>
<message name="IDS_TASK_MANAGER_TITLE" desc="The title of the Task Manager window">
- Task Manager - Chromium
+ Task Manager - Inox
</message>
<message name="IDS_SESSION_CRASHED_VIEW_MESSAGE" desc="Message shown when the last session didn't exit cleanly.">
- Chromium didn't shut down correctly.
+ Inox did not shut down correctly.
</message>
<message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble.">
Help make Chromium better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google
</message>
<!-- Browser Window Title Format -->
<message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabs and popup windows">
- <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Chromium
+ <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> Inox
</message>
<if expr="not chromeos">
<message name="IDS_GET_HELP_USING_CHROME" desc="Text of the button which takes the user to the Chrome help page.">
@@ -787,7 +787,7 @@ For Chromium, processes used to display diagnostics information (such as this "a
<if expr="use_titlecase and not chromeos">
<message name="IDS_ABOUT" desc="In Title Case: The text label of the About Chrome menu item">
- About &amp;Chromium
+ About &amp;Inox
</message>
<message name="IDS_UPDATE_NOW" desc="In Title Case: The text label of the Update Chrome Now menu item">
Update &amp;Chromium
@@ -795,7 +795,7 @@ For Chromium, processes used to display diagnostics information (such as this "a
</if>
<if expr="not use_titlecase and not chromeos">
<message name="IDS_ABOUT" desc="The text label of the About Chrome menu item">
- About &amp;Chromium
+ About &amp;Inox
</message>
<message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome Now menu item">
Update &amp;Chromium
@@ -812,7 +812,7 @@ For Chromium, processes used to display diagnostics information (such as this "a
<if expr="is_macosx">
<message name="IDS_APP_MENU_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome.">
- Chromium
+ Inox
</message>
<message name="IDS_HELPER_NAME" desc="The helper application's name. Should contain the Chrome application name (IDS_PRODUCT_NAME). Example: Google Chrome Helper.">
Chromium Helper
--- ./chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ ./chrome/browser/ui/toolbar/wrench_menu_model.cc.new
@@ -930,21 +930,7 @@
CreateCutCopyPasteMenu();
AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
-#if !defined(OS_CHROMEOS)
- if (!switches::IsNewAvatarMenu()) {
- // No "Sign in to Chromium..." menu item on ChromeOS.
- SigninManager* signin = SigninManagerFactory::GetForProfile(
- browser_->profile()->GetOriginalProfile());
- if (signin && signin->IsSigninAllowed() &&
- signin_ui_util::GetSignedInServiceErrors(
- browser_->profile()->GetOriginalProfile()).empty()) {
- AddItem(IDC_SHOW_SYNC_SETUP,
- l10n_util::GetStringFUTF16(
- IDS_SYNC_MENU_PRE_SYNCED_LABEL,
- l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
- }
- }
-#endif
+
// The help submenu is only displayed on official Chrome builds. As the
// 'About' item has been moved to this submenu, it's reinstated here for
// Chromium builds.

View File

@@ -0,0 +1,49 @@
--- ./components/autofill/core/browser/autofill_download_manager.cc
+++ ./components/autofill/core/browser/autofill_download_manager.cc.new
@@ -44,11 +44,6 @@
return std::string();
}
-GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) {
- return GURL("https://clients1.google.com/tbproxy/af/" +
- RequestTypeToString(request_type) + "?client=" + kClientName);
-}
-
} // namespace
struct AutofillDownloadManager::FormRequestData {
@@ -167,33 +167,6 @@
bool AutofillDownloadManager::StartRequest(
const std::string& form_xml,
const FormRequestData& request_data) {
- net::URLRequestContextGetter* request_context =
- driver_->GetURLRequestContext();
- DCHECK(request_context);
- GURL request_url = GetRequestUrl(request_data.request_type);
-
- // Id is ignored for regular chrome, in unit test id's for fake fetcher
- // factory will be 0, 1, 2, ...
- net::URLFetcher* fetcher =
- net::URLFetcher::Create(fetcher_id_for_unittest_++, request_url,
- net::URLFetcher::POST, this).release();
- url_fetchers_[fetcher] = request_data;
- fetcher->SetAutomaticallyRetryOn5xx(false);
- fetcher->SetRequestContext(request_context);
- fetcher->SetUploadData("text/plain", form_xml);
- fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
- net::LOAD_DO_NOT_SEND_COOKIES);
- // Add Chrome experiment state to the request headers.
- net::HttpRequestHeaders headers;
- variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders(
- fetcher->GetOriginalURL(), driver_->IsOffTheRecord(), false, &headers);
- fetcher->SetExtraRequestHeaders(headers.ToString());
- fetcher->Start();
-
- VLOG(1) << "Sending AutofillDownloadManager "
- << RequestTypeToString(request_data.request_type)
- << " request: " << form_xml;
-
return true;
}

View File

@@ -0,0 +1,149 @@
--- ./chrome/browser/extensions/external_component_loader.cc
+++ ./chrome/browser/extensions/external_component_loader.cc.new
@@ -35,30 +35,6 @@
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());
- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId);
-
- if (HotwordServiceFactory::IsHotwordAllowed(profile_))
- AddExternalExtension(extension_misc::kHotwordSharedModuleId);
-
-#if defined(OS_CHROMEOS)
- {
- base::CommandLine* const command_line =
- base::CommandLine::ForCurrentProcess();
- if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker))
- AddExternalExtension(extension_misc::kZIPUnpackerExtensionId);
- }
-#endif
-
-#if defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
- if (switches::MediaRouterEnabled())
- AddExternalExtension(extension_misc::kMediaRouterStableExtensionId);
-#endif // defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
-
-#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
- std::string google_now_extension_id;
- if (GetGoogleNowExtensionId(&google_now_extension_id))
- AddExternalExtension(google_now_extension_id);
-#endif
LoadFinished();
}
--- ./chrome/browser/extensions/component_loader.cc
+++ ./chrome/browser/extensions/component_loader.cc.new
@@ -350,24 +350,12 @@
}
void ComponentLoader::AddHangoutServicesExtension() {
-#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
- Add(IDR_HANGOUT_SERVICES_MANIFEST,
- base::FilePath(FILE_PATH_LITERAL("hangout_services")));
-#endif
}
void ComponentLoader::AddHotwordAudioVerificationApp() {
- if (HotwordServiceFactory::IsAlwaysOnAvailable()) {
- Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST,
- base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification")));
- }
}
void ComponentLoader::AddHotwordHelperExtension() {
- if (HotwordServiceFactory::IsHotwordAllowed(profile_)) {
- Add(IDR_HOTWORD_MANIFEST,
- base::FilePath(FILE_PATH_LITERAL("hotword")));
- }
}
void ComponentLoader::AddImageLoaderExtension() {
@@ -384,43 +384,6 @@
}
void ComponentLoader::AddGoogleNowExtension() {
-#if defined(ENABLE_GOOGLE_NOW)
- const char kEnablePrefix[] = "Enable";
- const char kFieldTrialName[] = "GoogleNow";
- std::string enable_prefix(kEnablePrefix);
- std::string field_trial_result =
- base::FieldTrialList::FindFullName(kFieldTrialName);
-
- bool enabled_via_field_trial =
- field_trial_result.compare(0, enable_prefix.length(), enable_prefix) == 0;
-
- // Enable the feature on trybots and trunk builds.
- bool enabled_via_trunk_build =
- chrome::GetChannel() == version_info::Channel::UNKNOWN;
-
- bool is_authenticated =
- SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated();
-
- bool enabled =
- (enabled_via_field_trial && is_authenticated) || enabled_via_trunk_build;
-
-#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
- // Don't load if newer trial is running (== new extension id is available).
- std::string ignored_extension_id;
- if (GetGoogleNowExtensionId(&ignored_extension_id)) {
- enabled = false;
- }
-#endif // defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
-
- const int google_now_manifest_id = IDR_GOOGLE_NOW_MANIFEST;
- const base::FilePath root_directory =
- base::FilePath(FILE_PATH_LITERAL("google_now"));
- if (enabled) {
- Add(google_now_manifest_id, root_directory);
- } else {
- DeleteData(google_now_manifest_id, root_directory);
- }
-#endif // defined(ENABLE_GOOGLE_NOW)
}
#if defined(OS_CHROMEOS)
@@ -495,15 +446,6 @@
}
void ComponentLoader::AddWebStoreApp() {
-#if defined(OS_CHROMEOS)
- if (!IsNormalSession())
- return;
-#endif
-
- AddWithNameAndDescription(
- IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")),
- l10n_util::GetStringUTF8(IDS_WEBSTORE_NAME_STORE),
- l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION));
}
scoped_refptr<const Extension> ComponentLoader::CreateExtension(
@@ -496,9 +496,6 @@
DCHECK(!skip_session_components);
Add(IDR_BOOKMARKS_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
- // Cloud Print component app. Not required on Chrome OS.
- Add(IDR_CLOUDPRINT_MANIFEST,
- base::FilePath(FILE_PATH_LITERAL("cloud_print")));
#endif
if (!skip_session_components) {
@@ -629,13 +571,6 @@
AddImageLoaderExtension();
AddGoogleNowExtension();
- bool install_feedback = enable_background_extensions_during_testing;
-#if defined(GOOGLE_CHROME_BUILD)
- install_feedback = true;
-#endif // defined(GOOGLE_CHROME_BUILD)
- if (install_feedback)
- Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback")));
-
#if defined(ENABLE_SETTINGS_APP)
Add(IDR_SETTINGS_APP_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("settings_app")));

View File

@@ -0,0 +1,32 @@
--- ./components/gcm_driver/gcm_channel_status_request.cc
+++ ./components/gcm_driver/gcm_channel_status_request.cc.new
@@ -19,8 +19,10 @@ namespace gcm {
namespace {
+#if 0
const char kRequestContentType[] = "application/octet-stream";
const char kGCMChannelTag[] = "gcm_channel";
+#endif
const int kDefaultPollIntervalSeconds = 60 * 60; // 60 minutes.
const int kMinPollIntervalSeconds = 30 * 60; // 30 minutes.
@@ -53,6 +55,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() {
}
void GCMChannelStatusRequest::Start() {
+#if 0
DCHECK(!url_fetcher_.get());
GURL request_url(channel_status_request_url_);
@@ -72,6 +75,9 @@ void GCMChannelStatusRequest::Start() {
url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
net::LOAD_DO_NOT_SAVE_COOKIES);
url_fetcher_->Start();
+#endif
+ // Simulate an empty response and disable GCM.
+ callback_.Run(false, false, 0);
}
void GCMChannelStatusRequest::OnURLFetchComplete(

View File

@@ -0,0 +1,17 @@
--- ./net/dns/host_resolver_impl.cc
+++ ./net/dns/host_resolver_impl.cc.new
@@ -78,10 +78,10 @@ const char kLocalhost[] = "localhost.";
// cached.
const int kIPv6ProbePeriodMs = 1000;
-// Google DNS address used for IPv6 probes.
+/* RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted) */
const uint8_t kIPv6ProbeAddress[] =
- { 0x20, 0x01, 0x48, 0x60, 0x48, 0x60, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88 };
+ { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
// We use a separate histogram name for each platform to facilitate the
// display of error codes by their symbolic name (since each platform has

View File

@@ -0,0 +1,50 @@
--- ./components/google/core/browser/google_url_tracker.cc
+++ ./components/google/core/browser/google_url_tracker.cc.new
@@ -129,45 +129,5 @@
}
void GoogleURLTracker::StartFetchIfDesirable() {
- // Bail if a fetch isn't appropriate right now. This function will be called
- // again each time one of the preconditions changes, so we'll fetch
- // immediately once all of them are met.
- //
- // See comments in header on the class, on RequestServerCheck(), and on the
- // various members here for more detail on exactly what the conditions are.
- if (in_startup_sleep_ || already_fetched_ || !need_to_fetch_)
- return;
- // Some switches should disable the Google URL tracker entirely. If we can't
- // do background networking, we can't do the necessary fetch, and if the user
- // specified a Google base URL manually, we shouldn't bother to look up any
- // alternatives or offer to switch to them.
- if (!client_->IsBackgroundNetworkingEnabled() ||
- base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kGoogleBaseURL))
- return;
-
- already_fetched_ = true;
- fetcher_ = net::URLFetcher::Create(fetcher_id_, GURL(kSearchDomainCheckURL),
- net::URLFetcher::GET, this);
- ++fetcher_id_;
- // We don't want this fetch to set new entries in the cache or cookies, lest
- // we alarm the user.
- fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
- net::LOAD_DO_NOT_SAVE_COOKIES);
- fetcher_->SetRequestContext(client_->GetRequestContext());
-
- // Configure to retry at most kMaxRetries times for 5xx errors.
- static const int kMaxRetries = 5;
- fetcher_->SetMaxRetriesOn5xx(kMaxRetries);
-
- // Also retry kMaxRetries times on network change errors. A network change can
- // propagate through Chrome in various stages, so it's possible for this code
- // to be reached via OnNetworkChanged(), and then have the fetch we kick off
- // be canceled due to e.g. the DNS server changing at a later time. In general
- // it's not possible to ensure that by the time we reach here any requests we
- // start won't be canceled in this fashion, so retrying is the best we can do.
- fetcher_->SetAutomaticallyRetryOnNetworkChanges(kMaxRetries);
-
- fetcher_->Start();
}

View File

@@ -0,0 +1,10 @@
--- ./chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
+++ ./chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc.new
@@ -15,6 +15,7 @@
// static
void GoogleApiKeysInfoBarDelegate::Create(InfoBarService* infobar_service) {
+ return;
if (google_apis::HasKeysConfigured())
return;

View File

@@ -0,0 +1,12 @@
--- ./chrome/browser/web_resource/notification_promo.cc
+++ ./chrome/browser/web_resource/notification_promo.cc.new
@@ -34,7 +34,7 @@ namespace {
const int kDefaultGroupSize = 100;
-const char promo_server_url[] = "https://clients3.google.com/crsignal/client";
+const char promo_server_url[] = "about:blank";
// The name of the preference that stores the promotion object.
const char kPrefPromoObject[] = "promo";

View File

@@ -0,0 +1,40 @@
--- ./components/translate/core/browser/translate_language_list.cc
+++ ./components/translate/core/browser/translate_language_list.cc.new
@@ -200,35 +200,6 @@
}
void TranslateLanguageList::RequestLanguageList() {
- // If resource requests are not allowed, we'll get a callback when they are.
- if (!resource_requests_allowed_) {
- request_pending_ = true;
- return;
- }
-
- request_pending_ = false;
-
- if (language_list_fetcher_.get() &&
- (language_list_fetcher_->state() == TranslateURLFetcher::IDLE ||
- language_list_fetcher_->state() == TranslateURLFetcher::FAILED)) {
- GURL url = TranslateLanguageUrl();
- url = AddHostLocaleToUrl(url);
- url = AddApiKeyToUrl(url);
- url = net::AppendQueryParameter(
- url, kAlphaLanguageQueryName, kAlphaLanguageQueryValue);
-
- std::string message = base::StringPrintf(
- "Language list including alpha languages fetch starts (URL: %s)",
- url.spec().c_str());
- NotifyEvent(__LINE__, message);
-
- bool result = language_list_fetcher_->Request(
- url,
- base::Bind(&TranslateLanguageList::OnLanguageListFetchComplete,
- base::Unretained(this)));
- if (!result)
- NotifyEvent(__LINE__, "Request is omitted due to retry limit");
- }
}
void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) {

View File

@@ -0,0 +1,17 @@
--- ./components/component_updater/configurator_impl.cc
+++ ./components/component_updater/configurator_impl.cc.new
@@ -153,14 +153,6 @@
std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
std::vector<GURL> urls;
- if (url_source_override_.is_valid()) {
- urls.push_back(GURL(url_source_override_));
- } else {
- urls.push_back(GURL(kUpdaterDefaultUrl));
- if (fallback_to_alt_source_url_enabled_) {
- urls.push_back(GURL(kUpdaterAltUrl));
- }
- }
return urls;
}

View File

@@ -0,0 +1,33 @@
--- ./Makefile
+++ ./Makefile.new
@@ -1,9 +1,9 @@
-OUT := chromium-launcher launcher-errmsg
+OUT := inox-launcher launcher-errmsg
CHROMIUM_SUFFIX :=
PREFIX := /usr/local
-CHROMIUM_NAME := chromium$(CHROMIUM_SUFFIX)
+CHROMIUM_NAME := inox$(CHROMIUM_SUFFIX)
CHROMIUM_BIN := /usr/lib/$(CHROMIUM_NAME)/$(CHROMIUM_NAME)
PEPPER_FLASH_DIR := /usr/lib/PepperFlash
@@ -15,7 +15,7 @@
all: $(OUT)
-chromium-launcher: chromium-launcher.in
+inox-launcher: chromium-launcher.in
sed \
-e "s|@CHROMIUM_NAME@|$(CHROMIUM_NAME)|g" \
-e "s|@CHROMIUM_BIN@|$(CHROMIUM_BIN)|g" \
@@ -24,7 +24,7 @@
$< >$@
install: all
- install -Dm755 chromium-launcher "$(DESTDIR)$(PREFIX)/bin/$(CHROMIUM_NAME)"
+ install -Dm755 inox-launcher "$(DESTDIR)$(PREFIX)/bin/$(CHROMIUM_NAME)"
install -Dm755 launcher-errmsg "$(DESTDIR)$(LAUNCHER_ERRMSG)"
install-strip: install

View File

@@ -0,0 +1,258 @@
--- ./chrome/browser/chrome_content_browser_client.cc
+++ ./chrome/browser/chrome_content_browser_client.cc.new
@@ -639,7 +639,7 @@
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
- registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true);
+ registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false);
registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures);
}
--- ./chrome/browser/ui/browser_ui_prefs.cc
+++ ./chrome/browser/ui/browser_ui_prefs.cc.new
@@ -86,7 +86,7 @@
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
- registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, true);
+ registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, false);
registry->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
--- ./chrome/browser/net/net_pref_observer.cc
+++ ./chrome/browser/net/net_pref_observer.cc.new
@@ -41,7 +41,7 @@ void NetPrefObserver::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kNetworkPredictionEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kDisableSpdy,
--- ./chrome/browser/background/background_mode_manager.cc
+++ ./chrome/browser/background/background_mode_manager.cc.new
@@ -330,7 +330,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
#endif
- registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
+ registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false);
}
--- ./components/content_settings/core/browser/cookie_settings.cc
+++ ./components/content_settings/core/browser/cookie_settings.cc.new
@@ -82,7 +82,7 @@
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
- prefs::kBlockThirdPartyCookies, false,
+ prefs::kBlockThirdPartyCookies, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
--- ./chrome/browser/ui/navigation_correction_tab_observer.cc
+++ ./chrome/browser/ui/navigation_correction_tab_observer.cc.new
@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
void NavigationCorrectionTabObserver::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* prefs) {
prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
--- ./components/autofill/core/browser/autofill_manager.cc
+++ ./components/autofill/core/browser/autofill_manager.cc.new
@@ -164,7 +164,7 @@ void AutofillManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kAutofillEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kAutofillWalletSyncExperimentEnabled,
--- ./chrome/browser/resources/options/reset_profile_settings_overlay.html
+++ ./chrome/browser/resources/options/reset_profile_settings_overlay.html.new
@@ -24,7 +24,7 @@
<div id="feedback-bar"
class="gray-bottom-bar checkbox controlled-setting-with-label">
<label>
- <input id="send-settings" type="checkbox" checked>
+ <input id="send-settings" type="checkbox">
<span>
<span i18n-content="resetProfileSettingsFeedback"></span>
<span id="expand-feedback"></span>
--- ./chrome/browser/io_thread.cc
+++ ./chrome/browser/io_thread.cc.new
@@ -1113,7 +1113,7 @@
data_reduction_proxy::prefs::kDataReductionProxy, std::string());
registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
data_reduction_proxy::RegisterPrefs(registry);
- registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
+ registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
}
--- ./extensions/common/extension.cc
+++ ./extensions/common/extension.cc.new
@@ -347,7 +347,7 @@
if (extensions::Manifest::IsComponentLocation(location()) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kShowComponentExtensionOptions)) {
- return true;
+ return false;
}
// Always show unpacked extensions and apps.
@@ -356,7 +356,7 @@
// Don't show apps that aren't visible in either launcher or ntp.
if (is_app() && !ShouldDisplayInAppLauncher() && !ShouldDisplayInNewTabPage())
- return true;
+ return false;
return false;
}
--- ./chrome/browser/signin/signin_promo.cc
+++ ./chrome/browser/signin/signin_promo.cc.new
@@ -253,8 +253,8 @@
void RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
- registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, false);
- registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true);
+ registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true);
+ registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false);
registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
}
--- ./chrome/browser/ui/browser_ui_prefs.cc
+++ ./chrome/browser/ui/browser_ui_prefs.cc.new
@@ -102,7 +102,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kEnableTranslate,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterStringPref(
prefs::kCloudPrintEmail,
--- ./components/bookmarks/browser/bookmark_utils.cc
+++ ./components/bookmarks/browser/bookmark_utils.cc.new
@@ -424,7 +424,7 @@
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kShowBookmarkBar,
- false,
+ true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kEditBookmarksEnabled,
@@ -432,7 +432,7 @@
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kShowAppsShortcutInBookmarkBar,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kShowManagedBookmarksInBookmarkBar,
--- ./chrome/browser/profiles/profile.cc
+++ ./chrome/browser/profiles/profile.cc.new
@@ -76,7 +76,7 @@
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
#if defined(OS_ANDROID)
registry->RegisterStringPref(
@@ -94,7 +94,7 @@
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kSafeBrowsingEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kSafeBrowsingExtendedReportingEnabled,
@@ -104,7 +104,7 @@
// This pref is intentionally outside the above #if. That flag corresponds
// to the Notifier extension and does not gate the launcher page.
// TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827.
- registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true);
+ registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, false);
registry->RegisterBooleanPref(prefs::kDisableExtensions, false);
#if defined(ENABLE_EXTENSIONS)
registry->RegisterBooleanPref(extensions::pref_names::kAlertsInitialized,
--- ./chrome/service/cloud_print/connector_settings.cc
+++ ./chrome/service/cloud_print/connector_settings.cc.new
@@ -58,7 +58,7 @@
DCHECK(server_url_.is_valid());
connect_new_printers_ = prefs->GetBoolean(
- prefs::kCloudPrintConnectNewPrinters, true);
+ prefs::kCloudPrintConnectNewPrinters, false);
xmpp_ping_enabled_ = prefs->GetBoolean(
prefs::kCloudPrintXmppPingEnabled, false);
--- ./components/signin/core/common/profile_management_switches.cc
+++ ./components/signin/core/common/profile_management_switches.cc.new
@@ -33,8 +33,7 @@
bool is_consistent_identity =
base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableAccountConsistency);
- bool not_new_avatar_menu = base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableNewAvatarMenu);
+ bool not_new_avatar_menu = 1;
bool not_new_profile_management =
base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableNewProfileManagement);
--- ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
+++ ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc.new
@@ -140,10 +140,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kLocalDiscoveryNotificationsEnabled,
-#if defined(OS_WIN)
false,
-#else
- true,
-#endif
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}

View File

@@ -0,0 +1,44 @@
--- ./chrome/browser/search/search.cc
+++ ./chrome/browser/search/search.cc.new
@@ -287,17 +287,7 @@
template_url->new_tab_url_ref(), UIThreadSearchTermsData(profile),
false, false);
NewTabURLState state = IsValidNewTabURL(profile, search_provider_url);
- switch (state) {
- case NEW_TAB_URL_VALID:
- // We can use the search provider's page.
- return NewTabURLDetails(search_provider_url, state);
- case NEW_TAB_URL_INCOGNITO:
- // Incognito has its own New Tab.
- return NewTabURLDetails(GURL(), state);
- default:
- // Use the local New Tab otherwise.
- return NewTabURLDetails(local_url, state);
- }
+ return NewTabURLDetails(local_url, state);
}
GURL url;
--- ./chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
+++ ./chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc.new
@@ -90,14 +90,9 @@
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(
Profile::FromWebUI(web_ui()));
- // Hide the sync status section if sync is managed or disabled entirely.
- if (!sync_service_ ||
- sync_service_->IsManaged() ||
- !signin ||
- !signin->IsSigninAllowed()) {
- HideSyncStatusSection();
- return;
- }
+ // Hide the sync status section
+ HideSyncStatusSection();
+ return;
// Don't show sync status if setup is not complete.
if (!sync_service_->HasSyncSetupCompleted()) {

View File

@@ -0,0 +1,46 @@
From 2b5edabe0f83c4bd85e86510e5ea63ba535eda1e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 2 Mar 2015 11:28:26 +0100
Subject: [PATCH 37/56] Remove EV certificates
The team chose to let EV certificates appear just like normal
certificates. The web of trust is considered a failure in itself, so
do not give users a false sense of extra security with EV certs.
Instead, let them appear just like regular ones.
---
net/cert/ev_root_ca_metadata.cc | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
index 8dd55f4..5813a6d 100644
--- a/net/cert/ev_root_ca_metadata.cc
+++ b/net/cert/ev_root_ca_metadata.cc
@@ -41,6 +41,17 @@ struct EVMetadata {
};
static const EVMetadata ev_root_ca_metadata[] = {
+ // need some dummy thing to make compiler happy, because
+ // arraysize() is implemented as a convoluted template rather than
+ // the traditional sizeof(x)/sizeof(*x)
+ { { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } },
+ {
+ "0",
+ }
+ },
+
+#if 0
// AC Camerfirma S.A. Chambers of Commerce Root - 2008
// https://www.camerfirma.com
{ { { 0x78, 0x6a, 0x74, 0xac, 0x76, 0xab, 0x14, 0x7f, 0x9c, 0x6a,
@@ -496,6 +507,7 @@ static const EVMetadata ev_root_ca_metadata[] = {
0xcf, 0x30, 0x54, 0xf3, 0x4c, 0x52, 0xb7, 0xe5, 0x58, 0xc6 } },
{"2.16.840.1.114404.1.1.2.4.1", ""},
}
+#endif
};
#endif // defined(USE_NSS_CERTS) || defined(OS_IOS) || defined(OS_WIN)
--
2.4.3

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,44 @@
From 7ff63c9f6fcc9d65cd7860b47ecc40de24f0607c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 11 Sep 2014 16:37:32 +0200
Subject: [PATCH 10/56] autofill: disable autofill download manager
Disables the autofill download manager (trk:158).
---
components/autofill/core/browser/autofill_download_manager.cc | 2 +-
components/autofill/core/browser/autofill_manager.cc | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc
index ffe6312..cb473de 100644
--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
@@ -56,7 +56,7 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) {
}
GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) {
- return GURL("https://clients1.google.com/tbproxy/af/" +
+ return GURL("trk:158:https://clients1.google.com/tbproxy/af/" +
RequestTypeToString(request_type) + "?client=" + kClientName);
}
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
index 5443327..22064e3 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -153,10 +153,12 @@ AutofillManager::AutofillManager(
external_delegate_(NULL),
test_delegate_(NULL),
weak_ptr_factory_(this) {
+#if 0
if (enable_download_manager == ENABLE_AUTOFILL_DOWNLOAD_MANAGER) {
download_manager_.reset(
new AutofillDownloadManager(driver, client_->GetPrefs(), this));
}
+#endif
}
AutofillManager::~AutofillManager() {}
--
2.4.3

View File

@@ -0,0 +1,50 @@
From a8f7d19b24c3541893750056dbab75dd58e94fba Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Tue, 4 Aug 2015 15:15:53 +0200
Subject: [PATCH 54/56] battery_status_service: disable more privacy nightmares
The W3C Battery Status API[1] has quite a laughable statement:
"The information disclosed has minimal impact on privacy or
fingerprinting, and therefore is exposed without permission grants".
Along comes a paper "The leaking battery, A privacy analysis of the
HTML5 Battery Status API."
Clean up after the W3C and disable the battery status updater which
could be used to identity users[2].
[1] http://www.w3.org/TR/battery-status/
[2] https://eprint.iacr.org/2015/616.pdf
References: https://github.com/iridium-browser/iridium-browser/issues/40
---
device/battery/battery_status_service.cc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/device/battery/battery_status_service.cc b/device/battery/battery_status_service.cc
index 453adb7..33430c2 100644
--- a/device/battery/battery_status_service.cc
+++ b/device/battery/battery_status_service.cc
@@ -40,6 +40,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
if (!battery_fetcher_)
battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
+#if 0
if (callback_list_.empty()) {
bool success = battery_fetcher_->StartListeningBatteryChange();
// On failure pass the default values back.
@@ -51,6 +52,10 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
// Send recent status to the new callback if already available.
callback.Run(status_);
}
+#else
+ // Always pass the default values.
+ callback.Run(BatteryStatus());
+#endif
return callback_list_.Add(callback);
}
--
2.4.3

View File

@@ -0,0 +1,30 @@
From eb46ffbf70ca991f2ef3c318bfb58c74e2e81f49 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Thu, 25 Jun 2015 15:51:59 +0200
Subject: [PATCH 52/56] browser: disable profile auto-import on first run
---
chrome/browser/chrome_browser_main.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index ba4ce89..eacec8f 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1456,11 +1456,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// preferences are registered, since some of the code that the importer
// touches reads preferences.
if (first_run::IsChromeFirstRun()) {
+#if 0
first_run::AutoImport(profile_,
master_prefs_->homepage_defined,
master_prefs_->do_import_items,
master_prefs_->dont_import_items,
master_prefs_->import_bookmarks_path);
+#endif
// Note: this can pop the first run consent dialog on linux.
first_run::DoPostImportTasks(profile_,
--
2.4.3

View File

@@ -0,0 +1,25 @@
From 033fd9cc4ed3b2a884352b96482b6dd3a8449900 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Tue, 9 Dec 2014 17:19:41 +0100
Subject: [PATCH 07/56] browser-ui: disable warning about missing API keys
We do not want to use the services anyway ;)
---
chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
index 537664d..e276930 100644
--- a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
+++ b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
@@ -15,6 +15,7 @@
// static
void GoogleApiKeysInfoBarDelegate::Create(InfoBarService* infobar_service) {
+ return;
if (google_apis::HasKeysConfigured())
return;
--
2.4.3

View File

@@ -0,0 +1,30 @@
From 2df4c9b7ea93e521f2426e1a4faf9a35596da165 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 29 Jan 2015 10:39:51 +0100
Subject: [PATCH 32/56] build: build the sandbox with PIE
(Position Independent Executable.)
This patch originally from openSUSE, chromium-sandbox-pie.patch.
---
sandbox/linux/sandbox_linux.gypi | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi
index 4df0f1b..7931969 100644
--- a/sandbox/linux/sandbox_linux.gypi
+++ b/sandbox/linux/sandbox_linux.gypi
@@ -221,7 +221,10 @@
],
'cflags': [
# For ULLONG_MAX
- '-std=gnu99',
+ '-std=gnu99 -fPIE',
+ ],
+ 'ldflags': [
+ '-pie',
],
'include_dirs': [
'../..',
--
2.4.3

View File

@@ -0,0 +1,64 @@
From f3c364bb9cf7cc6fbc67daf02820f79827f7800b Mon Sep 17 00:00:00 2001
From: Yuriy Shevchuk <yuriy@struktur.de>
Date: Tue, 23 Dec 2014 16:54:56 +0100
Subject: [PATCH 29/56] build: fix OSX branded build crashes on OSX
---
build/common.gypi | 2 +-
chrome/app/theme/chromium/BRANDING | 14 +++++++-------
chrome/common/chrome_constants.cc | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build/common.gypi b/build/common.gypi
index cce7b3c..7c526c1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1945,7 +1945,7 @@
['branding=="Chrome"', {
'mac_product_name%': 'Google Chrome',
}, { # else: branding!="Chrome"
- 'mac_product_name%': 'Chromium',
+ 'mac_product_name%': 'Iridium',
}],
# Official mac builds require a specific OS X SDK, but iOS and
# non-official mac builds do not.
diff --git a/chrome/app/theme/chromium/BRANDING b/chrome/app/theme/chromium/BRANDING
index f1e9946..1e39207 100644
--- a/chrome/app/theme/chromium/BRANDING
+++ b/chrome/app/theme/chromium/BRANDING
@@ -1,7 +1,7 @@
-COMPANY_FULLNAME=The Chromium Authors
-COMPANY_SHORTNAME=The Chromium Authors
-PRODUCT_FULLNAME=Chromium
-PRODUCT_SHORTNAME=Chromium
-PRODUCT_INSTALLER_FULLNAME=Chromium Installer
-PRODUCT_INSTALLER_SHORTNAME=Chromium Installer
-COPYRIGHT=Copyright 2015 The Chromium Authors. All rights reserved.
+COMPANY_FULLNAME=The browser authors
+COMPANY_SHORTNAME=The browser authors
+PRODUCT_FULLNAME=Iridium
+PRODUCT_SHORTNAME=Iridium
+PRODUCT_INSTALLER_FULLNAME=Iridium Installer
+PRODUCT_INSTALLER_SHORTNAME=Iridium Installer
+COPYRIGHT=Copyright 2015 the browser authors. Some rights reserved.
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index 4a1610f..47fcfc2 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -7,11 +7,11 @@
#define FPL FILE_PATH_LITERAL
#if defined(OS_MACOSX)
-#define CHROMIUM_PRODUCT_STRING "Chromium"
+#define CHROMIUM_PRODUCT_STRING "Iridium"
#if defined(GOOGLE_CHROME_BUILD)
#define PRODUCT_STRING "Google Chrome"
#elif defined(CHROMIUM_BUILD)
-#define PRODUCT_STRING "Chromium"
+#define PRODUCT_STRING "Iridium"
#else
#error Unknown branding
#endif
--
2.4.3

View File

@@ -0,0 +1,65 @@
From dc7c8adfe68488dcc4467c32904bd34d98011130 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 16:55:12 +0200
Subject: [PATCH 16/56] cloud-print: disable in prefs and component loader
Cloud Print should normally be autodisabled if no printers are shared.
But maybe that is not enough(?) Probably also needs to gain a checkbox
in the settings. Revisit..]
Also changes the setting for notifications about new cloud printers to
be off by default.
---
chrome/browser/extensions/component_loader.cc | 2 ++
chrome/browser/ui/browser_ui_prefs.cc | 2 +-
chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc | 4 ----
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index e92e237..d4f347b 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -555,10 +555,12 @@ void ComponentLoader::AddDefaultComponentExtensions(
DCHECK(!skip_session_components);
Add(IDR_BOOKMARKS_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
+#if 0
// Cloud Print component app. Not required on Chrome OS.
Add(IDR_CLOUDPRINT_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("cloud_print")));
#endif
+#endif
if (!skip_session_components) {
AddWebStoreApp();
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index d9741ec..c4b2204 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -86,7 +86,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
- registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, true);
+ registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, false);
registry->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
index eda0cdc..15cde3c 100644
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
@@ -140,10 +140,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kLocalDiscoveryNotificationsEnabled,
-#if defined(OS_WIN)
false,
-#else
- true,
-#endif
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
--
2.4.3

View File

@@ -0,0 +1,103 @@
From 781178f2a0f75e62ba87eea615a2ff24a9c7ddc7 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 8 Jul 2015 15:08:32 +0200
Subject: [PATCH 56/56] common: set Iridium version and change User-Agent
accordingly
Reduced version number:
We do not use @BUILD@ or @PATCH@, in particular not in the User-Agent
string.
As for the user agent, continue providing Chrome/* for possible
compatibility checks by the browser and/or websites, since we
really are still Chromium.
Note to self:
Update "Chromium/*" in UA string when updating chrome/version.
---
android_webview/common/aw_version_info_values.h.version | 2 +-
chrome/VERSION | 4 ++--
components/version_info/version_info.cc | 2 +-
components/version_info/version_info_values.h.version | 2 +-
content/common/user_agent.cc | 2 ++
extensions/shell/common/version.h.in | 2 +-
6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/android_webview/common/aw_version_info_values.h.version b/android_webview/common/aw_version_info_values.h.version
index 72faf97..7c0f43d 100644
--- a/android_webview/common/aw_version_info_values.h.version
+++ b/android_webview/common/aw_version_info_values.h.version
@@ -5,6 +5,6 @@
#ifndef ANDROID_WEBVIEW_COMMON_AW_VERSION_INFO_VALUES_H_
#define ANDROID_WEBVIEW_COMMON_AW_VERSION_INFO_VALUES_H_
-#define PRODUCT_VERSION "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
+#define PRODUCT_VERSION "@MAJOR@.@MINOR@"
#endif // ANDROID_WEBVIEW_COMMON_AW_VERSION_INFO_VALUES_H_
diff --git a/chrome/VERSION b/chrome/VERSION
index fa20596..0438b10 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=47
MINOR=0
-BUILD=2526
-PATCH=49
+BUILD=0
+PATCH=0
diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc
index de3f580..8118f2e 100644
--- a/components/version_info/version_info.cc
+++ b/components/version_info/version_info.cc
@@ -12,7 +12,7 @@
namespace version_info {
std::string GetProductNameAndVersionForUserAgent() {
- return "Chrome/" + GetVersionNumber();
+ return "Iridium/" + GetVersionNumber();
}
std::string GetProductName() {
diff --git a/components/version_info/version_info_values.h.version b/components/version_info/version_info_values.h.version
index 6232e35..3cf4fee 100644
--- a/components/version_info/version_info_values.h.version
+++ b/components/version_info/version_info_values.h.version
@@ -6,7 +6,7 @@
#define COMPONENTS_VERSION_INFO_VERSION_INFO_VALUES_H_
#define PRODUCT_NAME "@PRODUCT_FULLNAME@"
-#define PRODUCT_VERSION "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
+#define PRODUCT_VERSION "@MAJOR@.@MINOR@"
#define LAST_CHANGE "@LASTCHANGE@"
#define IS_OFFICIAL_BUILD @OFFICIAL_BUILD@
diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
index 467ad97..4ed8907 100644
--- a/content/common/user_agent.cc
+++ b/content/common/user_agent.cc
@@ -199,6 +199,8 @@ std::string BuildUserAgentFromOSAndProduct(const std::string& os_info,
product.c_str(),
WEBKIT_VERSION_MAJOR,
WEBKIT_VERSION_MINOR);
+ if (strncmp(product.c_str(), "Chrome/", 7) != 0)
+ base::StringAppendF(&user_agent, " Chrome/47.0.2526.49");
return user_agent;
}
diff --git a/extensions/shell/common/version.h.in b/extensions/shell/common/version.h.in
index c4627fe..bf7d274 100644
--- a/extensions/shell/common/version.h.in
+++ b/extensions/shell/common/version.h.in
@@ -7,7 +7,7 @@
#ifndef EXTENSIONS_SHELL_COMMON_VERSION_H_
#define EXTENSIONS_SHELL_COMMON_VERSION_H_
-#define PRODUCT_VERSION "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
+#define PRODUCT_VERSION "@MAJOR@.@MINOR@"
#define LAST_CHANGE "@LASTCHANGE@"
#endif // EXTENSIONS_SHELL_COMMON_VERSION_H_
--
2.4.3

View File

@@ -0,0 +1,33 @@
From 3bb0c73d0f6416895e9621ab0c7c8f1b5542e671 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 15 Sep 2014 10:58:42 +0200
Subject: [PATCH 04/56] dns: send IPv6 connectivity probes to RIPE DNS rather
than Google
Short of disabling the code (we may do that in a subsequent patch
anyway), avoid sending to Google.
---
net/dns/host_resolver_impl.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 97345a0..16fe64a 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -78,10 +78,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
// cached.
const int kIPv6ProbePeriodMs = 1000;
-// Google DNS address used for IPv6 probes.
+/* RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted) */
const uint8_t kIPv6ProbeAddress[] =
- { 0x20, 0x01, 0x48, 0x60, 0x48, 0x60, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88 };
+ { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
// We use a separate histogram name for each platform to facilitate the
// display of error codes by their symbolic name (since each platform has
--
2.4.3

View File

@@ -0,0 +1,42 @@
From 2e09bc7bc90e747406b930da573b5e51e497c25e Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Thu, 25 Jun 2015 15:34:10 +0200
Subject: [PATCH 53/56] extensions: always show component extensions in the ext
list
The attached patch makes sure that component extensions are always
shown in "chrome://extensions".
Currently these are
- Bookmark Manager
- Chromium PDF Viewer
- CryptoTokenExtension
References: https://github.com/iridium-browser/iridium-browser/issues/28
---
extensions/common/extension.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index 4232509..49dfd43 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -349,6 +349,7 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
}
bool Extension::ShouldNotBeVisible() const {
+#if 0
// Don't show component extensions because they are only extensions as an
// implementation detail of Chrome.
if (extensions::Manifest::IsComponentLocation(location()) &&
@@ -365,6 +366,7 @@ bool Extension::ShouldNotBeVisible() const {
if (is_app() && !ShouldDisplayInAppLauncher() && !ShouldDisplayInNewTabPage())
return true;
+#endif
return false;
}
--
2.4.3

View File

@@ -0,0 +1,41 @@
From 072f26722b1a0a19f0c56e477346d9a90f6c85a1 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 16:40:17 +0200
Subject: [PATCH 22/56] first_run: barf if metrics_reporting is activated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This patch is for debugging purposes and is meant for discovering
whether — despite our patching efforts — metrics_reporting is still
enabled somehow, and if so, say so on stderr.
Result: As of October 2014, metrics_reporting seems successfully
disabled, as no message is emitted.
---
chrome/browser/first_run/first_run_internal_posix.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/chrome/browser/first_run/first_run_internal_posix.cc b/chrome/browser/first_run/first_run_internal_posix.cc
index 6e97dd8..a5dc39b 100644
--- a/chrome/browser/first_run/first_run_internal_posix.cc
+++ b/chrome/browser/first_run/first_run_internal_posix.cc
@@ -17,6 +17,7 @@
#include "chrome/installer/util/google_update_settings.h"
#include "chrome/installer/util/master_preferences.h"
#include "components/startup_metric_utils/startup_metric_utils.h"
+#include <cstdio>
namespace first_run {
namespace internal {
@@ -37,6 +38,7 @@ void DoPostImportPlatformSpecificTasks(Profile* profile) {
// the pref (on Windows, the download is tagged with enable/disable stats so
// this is POSIX-specific).
if (GoogleUpdateSettings::GetCollectStatsConsent()) {
+ fprintf(stderr, "*** metrics_reporting = 1\n");
g_browser_process->local_state()->SetBoolean(
metrics::prefs::kMetricsReportingEnabled, true);
}
--
2.4.3

View File

@@ -0,0 +1,32 @@
From 29d7d8c8ddae7d697c283f56f505eacdf58a2ad8 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 17:12:43 +0200
Subject: [PATCH 27/56] first_run: deactivate autoupdate globally
We currently do not have any update service infrastructure in place
(i.e. on our webserver), and sending update requests to Google also
sounds meh (wrong provider, after all).
Also, there is no tunable in chrome://settings (or similar) yet to
turn it back on.
---
chrome/browser/extensions/extension_system_impl.cc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index bbf1452..694d435 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -149,6 +149,9 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
bool autoupdate_enabled = !profile_->IsGuestSession() &&
!profile_->IsSystemProfile();
+ if (autoupdate_enabled)
+ fprintf(stderr, "*** autoupdate was enabled, overriding with false\n");
+ autoupdate_enabled = false;
#if defined(OS_CHROMEOS)
if (!extensions_enabled)
autoupdate_enabled = false;
--
2.4.3

View File

@@ -0,0 +1,46 @@
From 413a008b3122757013c1a7be9475183a53a9cd8d Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Mon, 1 Jun 2015 17:14:34 +0200
Subject: [PATCH 40/56] google-cloud-messaging: disable experiment status check
This avoids trk:263 from triggering.
---
components/gcm_driver/gcm_channel_status_request.cc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gcm_driver/gcm_channel_status_request.cc
index bafaee3..3167562 100644
--- a/components/gcm_driver/gcm_channel_status_request.cc
+++ b/components/gcm_driver/gcm_channel_status_request.cc
@@ -21,8 +21,10 @@ namespace gcm {
namespace {
+#if 0
const char kRequestContentType[] = "application/octet-stream";
const char kGCMChannelTag[] = "gcm_channel";
+#endif
const int kDefaultPollIntervalSeconds = 60 * 60; // 60 minutes.
const int kMinPollIntervalSeconds = 30 * 60; // 30 minutes.
@@ -55,6 +57,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() {
}
void GCMChannelStatusRequest::Start() {
+#if 0
DCHECK(!url_fetcher_.get());
GURL request_url(channel_status_request_url_);
@@ -74,6 +77,9 @@ void GCMChannelStatusRequest::Start() {
url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
net::LOAD_DO_NOT_SAVE_COOKIES);
url_fetcher_->Start();
+#endif
+ // Simulate an empty response and disable GCM.
+ callback_.Run(false, false, 0);
}
void GCMChannelStatusRequest::OnURLFetchComplete(
--
2.4.3

View File

@@ -0,0 +1,45 @@
From 5aca8448909160fb218e9d74582a7ed650f4c064 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 19 Jun 2015 19:20:39 +0200
Subject: [PATCH 50/56] google_now: disable this
"Google Now is an intelligent personal assistant developed by Google.
It is available within the Google Search mobile application for
Android, as well as the Google Chrome web browser on personal
computers." (-WP)
Get off my lawn!
---
build/common.gypi | 2 +-
build/config/features.gni | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/common.gypi b/build/common.gypi
index 7c526c1..50b58ad 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -541,7 +541,7 @@
'enable_extensions%': 1,
# Enable Google Now.
- 'enable_google_now%': 1,
+ 'enable_google_now%': 0,
# Enable basic printing support and UI.
'enable_basic_printing%': 1,
diff --git a/build/config/features.gni b/build/config/features.gni
index 9a29d5e..13aa90f 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -82,7 +82,7 @@ declare_args() {
enable_autofill_dialog = !is_ios
- enable_google_now = !is_ios && !is_android
+ enable_google_now = false
enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos)
--
2.4.3

View File

@@ -0,0 +1,104 @@
From 7fe2903e71b37f8d238ca925b8c0827ebbbea1e3 Mon Sep 17 00:00:00 2001
From: amistry <amistry@chromium.org>
Date: Tue, 9 Jun 2015 12:18:39 -0700
Subject: [PATCH 49/56] hotword: disable at build time by default
Commit f269d3b548203e217e8c0080c2e22e7ae3efb51e upstream:
"""
Hotwording downloads a shared module from the web store containing a
NaCl module. There is a desire to build and distribute Chromium
without this happening. This change adds an "enable_hotwording" build
flag that is enabled by default, but can be disabled at compile time.
BUG=491435
Review URL: https://codereview.chromium.org/1160243004
Cr-Commit-Position: refs/heads/master@{#333548}
"""
Hard-disable hotwording by default even on a build level.
---
chrome/browser/BUILD.gn | 3 ++-
chrome/browser/extensions/component_loader.cc | 4 ++++
chrome/browser/search/hotword_service_unittest.cc | 4 ++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index ee23e48..91f92b5 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -23,7 +23,8 @@ declare_args() {
# 'Ok Google' hotwording is disabled by default. Set to true to enable. (This
# will download a closed-source NaCl module at startup.) Chrome-branded
# ChromeOS builds have this enabled by default.
- enable_hotwording = is_chrome_branded && is_chromeos
+ # OFFOFFOFFOFFOFFOFFOFF
+ enable_hotwording = false
}
additional_modules_list_file =
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index d4f347b..1e9b948 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -358,17 +358,21 @@ void ComponentLoader::AddHangoutServicesExtension() {
}
void ComponentLoader::AddHotwordAudioVerificationApp() {
+#if 0
if (HotwordServiceFactory::IsAlwaysOnAvailable()) {
Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification")));
}
+#endif
}
void ComponentLoader::AddHotwordHelperExtension() {
+#if 0
if (HotwordServiceFactory::IsHotwordAllowed(profile_)) {
Add(IDR_HOTWORD_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("hotword")));
}
+#endif
}
void ComponentLoader::AddImageLoaderExtension() {
diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
index c1571fb..e02ce43 100644
--- a/chrome/browser/search/hotword_service_unittest.cc
+++ b/chrome/browser/search/hotword_service_unittest.cc
@@ -160,6 +160,7 @@ INSTANTIATE_TEST_CASE_P(HotwordServiceTests,
// Disabled due to http://crbug.com/503963.
TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedLocale) {
+#if defined(ENABLE_HOTWORDING)
TestingProfile::Builder profile_builder;
scoped_ptr<TestingProfile> profile = profile_builder.Build();
@@ -201,6 +202,7 @@ TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedLocale) {
Profile* otr_profile = profile->GetOffTheRecordProfile();
SetApplicationLocale(otr_profile, "en");
EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile));
+#endif // defined(ENABLE_HOTWORDING)
}
TEST_P(HotwordServiceTest, ShouldReinstallExtension) {
@@ -257,6 +259,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) {
}
TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
+#if defined(ENABLE_HOTWORDING)
InitializeEmptyExtensionService();
service_->Init();
@@ -337,6 +340,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
#endif
EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
EXPECT_EQ(1, hotword_service->uninstall_count()); // no change
+#endif // defined(ENABLE_HOTWORDING)
}
TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) {
--
2.4.3

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,61 @@
From b9e4fcadee2bbf6c345ec8537b51173b8545dc36 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 5 Jan 2015 22:04:26 +0100
Subject: [PATCH 09/56] icons: change sad plugin icon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Security loves plugins that do not run anymore
“...aaaand it's gone.”
---
.../resources/default_100_percent/common/sadplugin.png | Bin 238 -> 448 bytes
.../resources/default_200_percent/common/sadplugin.png | Bin 321 -> 431 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/chrome/renderer/resources/default_100_percent/common/sadplugin.png b/chrome/renderer/resources/default_100_percent/common/sadplugin.png
index 9ad1225ac67146e719a3b6d6ab223c0c51d7227a..a2299dd496c83cf6a2a1fee1325b9a3d951db624 100644
GIT binary patch
delta 434
zcmV;j0Zsny0l)*07=H)^0002o9{M=|0007FOGiWi|A&vvzW@LL32;bRa{vGf6951U
z69E94oEQKA00(qQO+^Ra0R<HUE4Y3ZzyJUNQAtEWRA}DqS<4Q>Fbu1!{QobT69|o#
zC29JC_JTC+;n|LpG9;$uR!-@FQZ4abcvT%MfGUH;JW$-rQ-7QViYF3&6%=NHLTDy+
zX9{yc!CbMHnw9<;&DSr~ugv>2f+4H$<vg@A<%>(M7YQ*w%(Gg_X){}a!e27=?0(lS
zSUYZwU@>ND@O+Bc86Ab-s2#V4&0tSa)u_c=NhMZLWs5OJ$FR|k7Dw{~UN7@QFCWsZ
zm0R9uxj#7Gt$&SRadW&QhJ!-2ayU;u4jBjK9>Dl2RPAPxqNiy@r_zz)7tY_F?utZW
zZhn0XUDr0}6x3qa&&q9L^pV;Hij~PBD%sW5r{#$Osh_>Nv*Q%6n5WLZZ%a_~CQtFW
zf?o}aW<TC+g;`-tSNL?YE<LA8FK699tzk^{ZT1z5D=UIZ2h=JX2akJjm{PEXH9(!}
cJD`f|0WUsKmrp<K+yDRo07*qoM6N<$f=gY#egFUf
delta 222
zcmV<403rXt1MUHk7=Ho)0000P%yrKI006Z~L_t(|UbWLvY6UR}KvBU3xRvg}tp~ax
z;r$A?46h@pBMha}OTG>$BoKKZm@GTlY;^O#S$5OeLV6sgtH4k5C?iAxQ8ue4t9|;6
z$(=<UC#BlVvJ4E26t1SQ+ANegRz`f=vf&vf)6w$7uO{6D<X3*5ud9K*Aq;9+&5@gh
z$YHjdysZLK2yYffS~n+^l*%E1W@o=Q8*Lf9K6le4S{Lho;iuVQEuSr)G=&(g=g7bH
Y1s>j{kx89h&j0`b07*qoM6N<$f<1m=vH$=8
diff --git a/chrome/renderer/resources/default_200_percent/common/sadplugin.png b/chrome/renderer/resources/default_200_percent/common/sadplugin.png
index 7828679717652f624948068b199b38be4e8d1296..538587d3219ef33cc7a5175b68077d6a7aa11c51 100644
GIT binary patch
literal 431
zcmeAS@N?(olHy`uVBq!ia0vp^Q-HXM5lAp}oVfEJNU@|l`Z_W&wk<GxF)bd*XG-#R
zcVS?>+a<gN$m1;Vh%9Dc;1&j9Muu5)B!GesJzX3_JdU5e7RYs2frssZ1K)(zZ`gM3
z+Q7|OEov0J^6f64|LunA`@S$|ns#blyp`A%<>*sje57Qq=n;wSJrcRcGBb9~ezx$c
z`?tLteb?|`xpbmp@5Svp>GM-FN{lp<jXy@7FnGLgFaNcBg;s4Rt~}Xbvq2?4v471}
ztt6i4otkMaGvX83B)-+oGPtd@#n#(@@r_@*rq5u1_VHuT)R`;Qk8Ql(A13U<u=-}i
z^z&z5Tw+tYT;?(%HtU1B+J;I)n|H>Kue>YMOkTW~{fuu@oZ!qyY+tvBwte&7u|DgA
zzwpided-cdJPl4u@4pW8tZIpCL`h0wNvc(HQ7VvPFfuSS)ip5GH82e^GO{u-wlXo+
oHZZg@F!&wdvkXN;ZhlH;S|x4`UA$kUfEpM)UHx3vIVCg!0J#{XF8}}l
delta 306
zcmV-20nPre1Hl527=Hu<0000|o%~?{000$GOjJbx00960{{{vI5D*Xn0Ra>g6aoSQ
z8Er^(0002zNkl<ZcwX(<(FOxC6olbv%ihmJ_5EL|H#O9hSYnJg|5YsctQC$GoZQ53
zZIr5^$a;z;6px~YLJ0-bQz)TiIYnkEl1oZ-iqbYohLL${U4Ju$AjLDOq1Mt+015b-
zh*G#miOo?0d`&@h6jgv)eRdV3Amj$c2qn|YQ>vIkHw6%Q?xS9hJrwr674Y6PssUX4
zC>(LF1k_PJ5<H(032L4FH^nI^f0m^ja!O?>NkU5~L9$Ay|89_S>z6K|7S&Qip_(!l
zB#@)rGS^2#mMc<DsQ^`Z2{6}#Lk;B^hFT?PJC$#mJ~;f`sw-B-O#lD@07*qoM6N<$
Ef|m1myZ`_I
--
2.4.3

View File

@@ -0,0 +1,26 @@
From 8c79c634ec5c21a2d6f76d77b5dc6f72075c1c9c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 29 Jan 2015 10:46:40 +0100
Subject: [PATCH 08/56] mime_util: force text/x-suse-ymp to be downloaded
YMP files (YaST One Click Install) are plaintext XML, but also not
very interesting in themselves. Force them to be stored.
---
components/mime_util/mime_util.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/mime_util/mime_util.cc b/components/mime_util/mime_util.cc
index fa7471b..c9b0d2b 100644
--- a/components/mime_util/mime_util.cc
+++ b/components/mime_util/mime_util.cc
@@ -84,6 +84,7 @@ static const char* const kUnsupportedTextTypes[] = {
"text/x-csv",
"text/x-vcf",
"text/rtf",
+ "text/x-suse-ymp",
"text/comma-separated-values",
"text/csv",
"text/tab-separated-values",
--
2.4.3

View File

@@ -0,0 +1,637 @@
From fc752e717533de4a950648bf9e910dc0ac3d1657 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 20 May 2015 01:34:50 +0200
Subject: [PATCH 41/56] net: add "trk:" scheme and help identify URLs being
retrieved
The Chromium codebase has left us with a number of suspect URLs, and
we want to know if the browser attempts to contact those sites.
This patch introduces a new scheme, "trk:", which, when attempted to
being processed, will dump a warning onto the screen as the resource
is loaded. All URLs we think are suspect are "blacklisted" by
prepending the new scheme to an existing URL:
trk:1234:https://clients4.google.com/
trk:https://clients4.google.com/ (unnumbered old variant)
trk:0.1234:https://... (stderr only, no UI reporting)
Upon seeing a warning, we then know to investigate further, and either
(a) whitelist the URL, that is, remove the trk: prefix and not show
the warning, and/or (b) disable the particular feature which caused
the loading of the URL in the first place, by default.
Implementation:
We hack up the URLFetcher class which sits in the network stack, and
most of the URL that get loaded pass through here. The trk: prefix is
stripped and processing continues with the inner URL.
---
chrome/app/chrome_main.cc | 20 ++++++++
.../chrome_autocomplete_scheme_classifier.cc | 1 +
chrome/browser/history/history_utils.cc | 1 +
chrome/browser/ui/browser_command_controller.cc | 3 +-
chrome/browser/ui/browser_navigator.cc | 8 +++
chrome/browser/ui/singleton_tabs.cc | 3 +-
chrome/chrome_dll.gypi | 1 +
chrome/chrome_exe.gypi | 1 +
components/omnibox/browser/autocomplete_input.cc | 8 +--
content/browser/browser_url_handler_impl.cc | 20 ++++++++
.../browser/child_process_security_policy_impl.cc | 7 ++-
iridium/iridium.gyp | 19 +++++++
iridium/trkbar.cpp | 40 +++++++++++++++
iridium/trkbar.h | 32 ++++++++++++
iridium/trknotify.cpp | 59 ++++++++++++++++++++++
iridium/trknotify.h | 20 ++++++++
net/url_request/url_request.cc | 7 +++
net/url_request/url_request.h | 2 +
url/gurl.cc | 35 +++++++++++++
url/gurl.h | 5 ++
url/url_constants.cc | 1 +
url/url_constants.h | 1 +
22 files changed, 287 insertions(+), 7 deletions(-)
create mode 100644 iridium/iridium.gyp
create mode 100644 iridium/trkbar.cpp
create mode 100644 iridium/trkbar.h
create mode 100644 iridium/trknotify.cpp
create mode 100644 iridium/trknotify.h
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index 360b7e5..5193c3a 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -5,6 +5,10 @@
#include "chrome/app/chrome_main_delegate.h"
#include "content/public/app/content_main.h"
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
+# include "net/url_request/url_request.h"
+# include "iridium/trknotify.h"
+#endif
#if defined(OS_WIN)
#include "base/debug/dump_without_crashing.h"
@@ -25,6 +29,19 @@ int ChromeMain(int argc, const char** argv);
}
#endif
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
+static void trace_url_request(const std::string &caller, const GURL &url)
+{
+ iridium::log_url_request(caller, url);
+ if (url.scheme() != url::kTraceScheme)
+ /* Do not show infobar for non-trk URLs */
+ return;
+ if (url.is_trq())
+ return;
+ iridium::trace_url_request(caller, url);
+}
+#endif
+
#if defined(OS_WIN)
DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
sandbox::SandboxInterfaceInfo* sandbox_info) {
@@ -63,6 +80,9 @@ int ChromeMain(int argc, const char** argv) {
params.argv = argv;
#endif
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
+ net::trace_urlreq_cb = &trace_url_request;
+#endif
int rv = content::ContentMain(params);
#if defined(OS_WIN)
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
index 61e5f32..b01574e 100644
--- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
@@ -26,6 +26,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
if (base::IsStringASCII(scheme) &&
(ProfileIOData::IsHandledProtocol(scheme) ||
base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
+ base::LowerCaseEqualsASCII(scheme, url::kTraceScheme) ||
base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) ||
base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) {
return metrics::OmniboxInputType::URL;
diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/history_utils.cc
index 1bc5e8d..6e7210a 100644
--- a/chrome/browser/history/history_utils.cc
+++ b/chrome/browser/history/history_utils.cc
@@ -19,6 +19,7 @@ bool CanAddURLToHistory(const GURL& url) {
url.SchemeIs(content::kChromeDevToolsScheme) ||
url.SchemeIs(content::kChromeUIScheme) ||
url.SchemeIs(content::kViewSourceScheme) ||
+ url.SchemeIs(url::kTraceScheme) ||
url.SchemeIs(chrome::kChromeNativeScheme) ||
url.SchemeIs(chrome::kChromeSearchScheme) ||
url.SchemeIs(dom_distiller::kDomDistillerScheme))
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index 395cdc9..ba793c7 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -103,7 +103,8 @@ bool HasInternalURL(const NavigationEntry* entry) {
// If the |virtual_url()| isn't a chrome:// URL, check if it's actually
// view-source: of a chrome:// URL.
- if (entry->GetVirtualURL().SchemeIs(content::kViewSourceScheme))
+ if (entry->GetVirtualURL().SchemeIs(content::kViewSourceScheme) ||
+ entry->GetVirtualURL().SchemeIs(url::kTraceScheme))
return entry->GetURL().SchemeIs(content::kChromeUIScheme);
return false;
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index d5573b1..65baf5c 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -623,6 +623,14 @@ bool IsURLAllowedInIncognito(const GURL& url,
return stripped_url.is_valid() &&
IsURLAllowedInIncognito(stripped_url, browser_context);
}
+
+ if (url.SchemeIs(url::kTraceScheme)) {
+ /* Same as view-source:, strip prefix and re-check. */
+ auto url2 = url.strip_trk();
+ return url2.is_valid() &&
+ IsURLAllowedInIncognito(url2, browser_context);
+ }
+
// Most URLs are allowed in incognito; the following are exceptions.
// chrome://extensions is on the list because it redirects to
// chrome://settings.
diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
index 870e8df..bdea535 100644
--- a/chrome/browser/ui/singleton_tabs.cc
+++ b/chrome/browser/ui/singleton_tabs.cc
@@ -100,7 +100,8 @@ int GetIndexOfSingletonTab(NavigateParams* params) {
// Skip view-source tabs. This is needed because RewriteURLIfNecessary
// removes the "view-source:" scheme which leads to incorrect matching.
- if (tab_url.SchemeIs(content::kViewSourceScheme))
+ if (tab_url.SchemeIs(content::kViewSourceScheme) ||
+ tab_url.SchemeIs(url::kTraceScheme))
continue;
GURL rewritten_tab_url = tab_url;
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index d246635..c8007cf 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -92,6 +92,7 @@
'app/delay_load_hook_win.h',
],
'dependencies': [
+ '../iridium/iridium.gyp:trknotify',
'<@(chromium_browser_dependencies)',
'../content/content.gyp:content_app_browser',
],
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 6865227..8ed0547 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -196,6 +196,7 @@
'app/chrome_main_delegate.h',
],
'dependencies': [
+ '../iridium/iridium.gyp:trknotify',
# On Linux, link the dependencies (libraries) that make up actual
# Chromium functionality directly into the executable.
'<@(chromium_browser_dependencies)',
diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
index d5e10f5b..c2b6f68 100644
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -472,7 +472,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
int after_scheme_and_colon = parts.scheme.end() + 1;
// For the view-source scheme, we should emphasize the scheme and host of the
// URL qualified by the view-source prefix.
- if (base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) &&
+ if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
+ base::LowerCaseEqualsASCII(scheme_str, url::kTraceScheme)) &&
(static_cast<int>(text.length()) > after_scheme_and_colon)) {
// Obtain the URL prefixed by view-source and parse it.
base::string16 real_url(text.substr(after_scheme_and_colon));
@@ -539,9 +540,10 @@ int AutocompleteInput::NumNonHostComponents(const url::Parsed& parts) {
bool AutocompleteInput::HasHTTPScheme(const base::string16& input) {
std::string utf8_input(base::UTF16ToUTF8(input));
url::Component scheme;
- if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme)) {
+ if (url::FindAndCompareScheme(utf8_input, url::kTraceScheme, &scheme))
+ gurl_strip_trk(utf8_input);
+ else if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme))
utf8_input.erase(0, scheme.end() + 1);
- }
return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, NULL);
}
diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc
index 4f1ed35..31b0cbd 100644
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -10,9 +10,28 @@
#include "content/public/browser/content_browser_client.h"
#include "content/public/common/url_constants.h"
#include "url/gurl.h"
+#include "net/url_request/url_request.h"
namespace content {
+static bool handle_trace_scheme(GURL *url, BrowserContext *)
+{
+ if (!url->SchemeIs(url::kTraceScheme))
+ return false;
+ if (net::trace_urlreq_cb != NULL)
+ (*net::trace_urlreq_cb)("handle_trace_scheme", *url);
+ *url = url->strip_trk();
+ return false;
+}
+
+static bool trace_scheme_revlookup(GURL *url, BrowserContext *)
+{
+ if (url->SchemeIs(url::kTraceScheme))
+ return false;
+ *url = GURL(url::kTraceScheme + (":" + url->spec()));
+ return true;
+}
+
// Handles rewriting view-source URLs for what we'll actually load.
static bool HandleViewSource(GURL* url, BrowserContext* browser_context) {
if (url->SchemeIs(kViewSourceScheme)) {
@@ -96,6 +115,7 @@ BrowserURLHandlerImpl::BrowserURLHandlerImpl() :
// view-source:
AddHandlerPair(&HandleViewSource, &ReverseViewSource);
+ AddHandlerPair(&handle_trace_scheme, &trace_scheme_revlookup);
}
BrowserURLHandlerImpl::~BrowserURLHandlerImpl() {
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index 9e94f34..a8f1916 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -306,6 +306,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
RegisterPseudoScheme(url::kAboutScheme);
RegisterPseudoScheme(url::kJavaScriptScheme);
RegisterPseudoScheme(kViewSourceScheme);
+ RegisterPseudoScheme(url::kTraceScheme);
}
ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() {
@@ -394,7 +395,7 @@ void ChildProcessSecurityPolicyImpl::GrantRequestURL(
if (IsPseudoScheme(url.scheme())) {
// The view-source scheme is a special case of a pseudo-URL that eventually
// results in requesting its embedded URL.
- if (url.SchemeIs(kViewSourceScheme)) {
+ if (url.SchemeIs(kViewSourceScheme) || url.SchemeIs(url::kTraceScheme)) {
// URLs with the view-source scheme typically look like:
// view-source:http://www.google.com/a
// In order to request these URLs, the child_id needs to be able to
@@ -586,13 +587,15 @@ bool ChildProcessSecurityPolicyImpl::CanRequestURL(
if (IsPseudoScheme(url.scheme())) {
// There are a number of special cases for pseudo schemes.
- if (url.SchemeIs(kViewSourceScheme)) {
+ if (url.SchemeIs(kViewSourceScheme) || url.SchemeIs(url::kTraceScheme)) {
// A view-source URL is allowed if the child process is permitted to
// request the embedded URL. Careful to avoid pointless recursion.
GURL child_url(url.GetContent());
if (child_url.SchemeIs(kViewSourceScheme) &&
url.SchemeIs(kViewSourceScheme))
return false;
+ if (child_url.SchemeIs(url::kTraceScheme) && url.SchemeIs(url::kTraceScheme))
+ return false;
return CanRequestURL(child_id, child_url);
}
diff --git a/iridium/iridium.gyp b/iridium/iridium.gyp
new file mode 100644
index 0000000..a1fee8f
--- /dev/null
+++ b/iridium/iridium.gyp
@@ -0,0 +1,19 @@
+{
+ 'targets': [
+ {
+ 'target_name': 'trknotify',
+ 'type': 'static_library',
+ 'sources': [
+ 'trknotify.cpp',
+ 'trknotify.h',
+ 'trkbar.cpp',
+ 'trkbar.h',
+ ],
+ 'include_dirs': [
+ '..',
+ '../third_party/skia/include/config',
+ '../third_party/skia/include/core',
+ ],
+ },
+ ],
+}
diff --git a/iridium/trkbar.cpp b/iridium/trkbar.cpp
new file mode 100644
index 0000000..bf0139c
--- /dev/null
+++ b/iridium/trkbar.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 The Iridium Authors
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "base/strings/utf_string_conversions.h"
+#include "components/infobars/core/infobar.h"
+#include "iridium/trkbar.h"
+
+namespace content {
+
+void TrkBar::Create(InfoBarService *s, const GURL &url)
+{
+ s->AddInfoBar(s->CreateConfirmInfoBar(
+ scoped_ptr<ConfirmInfoBarDelegate>(new TrkBar(url))
+ ));
+}
+
+bool TrkBar::ShouldExpire(const NavigationDetails &) const
+{
+ return false;
+}
+
+TrkBar::TrkBar(const GURL &url) :
+ ConfirmInfoBarDelegate(), m_url(url)
+{
+}
+
+base::string16 TrkBar::GetMessageText(void) const
+{
+ return base::ASCIIToUTF16("Loading traced URL: " + m_url.spec());
+}
+
+int TrkBar::GetButtons(void) const
+{
+ return BUTTON_NONE;
+}
+
+}; /* namespace content */
diff --git a/iridium/trkbar.h b/iridium/trkbar.h
new file mode 100644
index 0000000..ade2eb7
--- /dev/null
+++ b/iridium/trkbar.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015 The Iridium Authors.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef IRIDIUM_TRKBAR_H
+#define IRIDIUM_TRKBAR_H 1
+
+#include "chrome/browser/infobars/infobar_service.h"
+#include "components/infobars/core/confirm_infobar_delegate.h"
+#include "url/gurl.h"
+
+namespace content {
+
+class TrkBar : public ConfirmInfoBarDelegate {
+ public:
+ static void Create(InfoBarService *, const GURL &);
+ bool ShouldExpire(const NavigationDetails &) const override;
+
+ private:
+ TrkBar(const GURL &);
+ base::string16 GetMessageText(void) const override;
+ int GetButtons(void) const override;
+
+ GURL m_url;
+ DISALLOW_COPY_AND_ASSIGN(TrkBar);
+};
+
+}; /* namespace content */
+
+#endif /* IRIDIUM_TRKBAR_H */
diff --git a/iridium/trknotify.cpp b/iridium/trknotify.cpp
new file mode 100644
index 0000000..16fdbfe
--- /dev/null
+++ b/iridium/trknotify.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015 The Iridium Authors.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include <cstdio>
+#ifdef __linux__
+# include <unistd.h>
+#endif
+#include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "content/public/browser/browser_thread.h"
+#include "url/url_constants.h"
+#include "iridium/trkbar.h"
+#include "iridium/trknotify.h"
+
+namespace iridium {
+
+void log_url_request(const std::string &caller, const GURL &url)
+{
+#ifdef __linux__
+ bool tty = isatty(fileno(stderr));
+#else
+ bool tty = false;
+#endif
+ const char *xred = tty ? "\033[1;37;41m" : ""; // ]
+ const char *xfruit = tty ? "\033[33m" : ""; // ]
+ const char *xdark = tty ? "\033[1;30m" : ""; // ]
+ const char *xreset = tty ? "\033[0m" : ""; // ]
+
+ if (url.scheme() == url::kTraceScheme)
+ fprintf(stderr, "%s*** %s(%s)%s\n", xred, caller.c_str(),
+ url.possibly_invalid_spec().c_str(), xreset);
+ else
+ fprintf(stderr, "%s***%s %s(%s)%s\n", xfruit, xdark,
+ caller.c_str(), url.possibly_invalid_spec().c_str(),
+ xreset);
+}
+
+static void __trace_url_request(const std::string &caller, const GURL &url)
+{
+ auto browser = chrome::FindLastActiveWithHostDesktopType(chrome::GetActiveDesktop());
+ if (browser == NULL)
+ return;
+
+ auto service = InfoBarService::FromWebContents(browser->tab_strip_model()->GetActiveWebContents());
+ content::TrkBar::Create(service, url);
+}
+
+void trace_url_request(const std::string &caller, const GURL &url)
+{
+ content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
+ base::Bind(&__trace_url_request, caller, url));
+}
+
+}; /* namespace iridium */
diff --git a/iridium/trknotify.h b/iridium/trknotify.h
new file mode 100644
index 0000000..3c58d22
--- /dev/null
+++ b/iridium/trknotify.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2015 The Iridium Authors.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef IRIDIUM_TRKNOTIFY_H
+#define IRIDIUM_TRKNOTIFY_H 1
+
+#include <string>
+#include "url/gurl.h"
+
+namespace iridium {
+
+extern void log_url_request(const std::string &, const GURL &);
+extern void trace_url_request(const std::string &, const GURL &);
+
+}; /* namespace iridium */
+
+#endif /* IRIDIUM_TRKNOTIFY_H */
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 03f3f02..ac61270 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -45,6 +45,8 @@ using std::string;
namespace net {
+void (*trace_urlreq_cb)(const std::string &, const GURL &);
+
namespace {
// Max number of http redirects to follow. Same number as gecko.
@@ -576,6 +578,11 @@ URLRequest::URLRequest(const GURL& url,
DCHECK(base::MessageLoop::current())
<< "The current base::MessageLoop must exist";
+ if (trace_urlreq_cb != NULL)
+ (*trace_urlreq_cb)("URLRequest", url);
+ if (url.scheme() == url::kTraceScheme)
+ url_chain_[0] = url.strip_trk();
+
context->url_requests()->insert(this);
net_log_.BeginEvent(NetLog::TYPE_REQUEST_ALIVE);
}
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 9209697..37e9d6b 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -853,6 +853,8 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
DISALLOW_COPY_AND_ASSIGN(URLRequest);
};
+extern void NET_EXPORT (*trace_urlreq_cb)(const std::string &, const GURL &);
+
} // namespace net
#endif // NET_URL_REQUEST_URL_REQUEST_H_
diff --git a/url/gurl.cc b/url/gurl.cc
index e2ca9d7..8b78c89 100644
--- a/url/gurl.cc
+++ b/url/gurl.cc
@@ -534,6 +534,41 @@ void GURL::Swap(GURL* other) {
inner_url_.swap(other->inner_url_);
}
+std::string &gurl_strip_trk(std::string &s)
+{
+ auto slen = strlen(url::kTraceScheme);
+ if (!isdigit(s[slen+1]))
+ /* trk:https://... */
+ return s.erase(0, slen);
+ /* trk:123:https://... (or so we hope) */
+ auto pos = s.find(':', slen + 1);
+ if (pos == std::string::npos)
+ return s.erase(0, slen);
+ return s.erase(0, pos + 1);
+}
+
+bool gurl_is_trq(const std::string &s)
+{
+ auto slen = strlen(url::kTraceScheme);
+ /* trk:0.nnn:http:// makes for a quiet one */
+ return s[slen+1] == '0' && s[slen+2] == '.';
+}
+
+GURL GURL::strip_trk(void) const
+{
+ if (!SchemeIs(url::kTraceScheme))
+ return *this;
+ auto s = spec();
+ return GURL(gurl_strip_trk(s));
+}
+
+bool GURL::is_trq(void) const
+{
+ if (!SchemeIs(url::kTraceScheme))
+ return false;
+ return gurl_is_trq(spec());
+}
+
std::ostream& operator<<(std::ostream& out, const GURL& url) {
return out << url.possibly_invalid_spec();
}
diff --git a/url/gurl.h b/url/gurl.h
index 8c274ea..14ff966 100644
--- a/url/gurl.h
+++ b/url/gurl.h
@@ -393,6 +393,9 @@ class URL_EXPORT GURL {
return inner_url_.get();
}
+ GURL strip_trk(void) const;
+ bool is_trq(void) const;
+
private:
// Variant of the string parsing constructor that allows the caller to elect
// retain trailing whitespace, if any, on the passed URL spec, but only if
@@ -436,5 +439,7 @@ class URL_EXPORT GURL {
// Stream operator so GURL can be used in assertion statements.
URL_EXPORT std::ostream& operator<<(std::ostream& out, const GURL& url);
+URL_EXPORT std::string &gurl_strip_trk(std::string &);
+URL_EXPORT bool gurl_is_trq(const std::string &);
#endif // URL_GURL_H_
diff --git a/url/url_constants.cc b/url/url_constants.cc
index 2dc1478..5e53b05 100644
--- a/url/url_constants.cc
+++ b/url/url_constants.cc
@@ -20,6 +20,7 @@ const char kHttpScheme[] = "http";
const char kHttpsScheme[] = "https";
const char kJavaScriptScheme[] = "javascript";
const char kMailToScheme[] = "mailto";
+const char kTraceScheme[] = "trk";
const char kWsScheme[] = "ws";
const char kWssScheme[] = "wss";
diff --git a/url/url_constants.h b/url/url_constants.h
index c48dafc..18770d0 100644
--- a/url/url_constants.h
+++ b/url/url_constants.h
@@ -24,6 +24,7 @@ URL_EXPORT extern const char kHttpScheme[];
URL_EXPORT extern const char kHttpsScheme[];
URL_EXPORT extern const char kJavaScriptScheme[];
URL_EXPORT extern const char kMailToScheme[];
+URL_EXPORT extern const char kTraceScheme[];
URL_EXPORT extern const char kWsScheme[];
URL_EXPORT extern const char kWssScheme[];
--
2.4.3

View File

@@ -0,0 +1,28 @@
From ea69cb91617eb5c3661fcfbea941e20a0b872df8 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 15 Sep 2014 10:52:32 +0200
Subject: [PATCH 01/56] net/cert: increase default key length for
newly-generated RSA keys
Should we add something for chrome://settings, or just leave
it as hidden as it was before?
---
net/cert/x509_util.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/cert/x509_util.cc b/net/cert/x509_util.cc
index bbdc194..eff3b51 100644
--- a/net/cert/x509_util.cc
+++ b/net/cert/x509_util.cc
@@ -15,7 +15,7 @@ namespace net {
namespace x509_util {
// RSA keys created by CreateKeyAndSelfSignedCert will be of this length.
-static const uint16_t kRSAKeyLength = 1024;
+static const uint16_t kRSAKeyLength = 2048;
// Certificates made by CreateKeyAndSelfSignedCert and
// CreateKeyAndChannelIDEC will be signed using this digest algorithm.
--
2.4.3

View File

@@ -0,0 +1,49 @@
From 19d7afc46d4f0b49721b7e119d2bf7e5867d7227 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Wed, 15 Apr 2015 15:19:21 +0200
Subject: [PATCH 34/56] plugin: do not load any system-provided plugins on
Windows
---
content/common/plugin_list_win.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/content/common/plugin_list_win.cc b/content/common/plugin_list_win.cc
index 4b20953..fc40e1e 100644
--- a/content/common/plugin_list_win.cc
+++ b/content/common/plugin_list_win.cc
@@ -316,6 +316,7 @@ void PluginList::GetPluginDirectories(
// Load from the executable area
GetExeDirectory(&dirs);
+#if 0 /* NOTE: Iridium is not to load any system-provided plugins */
// Load Java
GetJavaDirectory(&dirs);
@@ -328,6 +329,7 @@ void PluginList::GetPluginDirectories(
GetAcrobatDirectory(&dirs);
GetQuicktimeDirectory(&dirs);
GetWindowsMediaDirectory(&dirs);
+#endif
for (std::set<base::FilePath>::iterator i = dirs.begin(); i != dirs.end(); ++i)
plugin_dirs->push_back(*i);
@@ -364,6 +366,7 @@ void PluginList::GetPluginPathsFromRegistry(
std::set<base::FilePath> plugin_dirs;
+#if 0 /* NOTE: Iridium is not to load any system-provided plugins */
// Search for plugins from HKCU and HKLM. THis will only find plugins that
// are correctly registered in the correct WOW64 registry hive.
GetPluginsInRegistryDirectory(HKEY_CURRENT_USER,
@@ -374,6 +377,7 @@ void PluginList::GetPluginPathsFromRegistry(
kRegistryMozillaPlugins,
0,
&plugin_dirs);
+#endif
for (std::set<base::FilePath>::iterator i = plugin_dirs.begin();
i != plugin_dirs.end(); ++i) {
--
2.4.3

View File

@@ -0,0 +1,30 @@
From 61d1719485eaa74cad5ba9d73e0a25fa288f54f0 Mon Sep 17 00:00:00 2001
From: Ivan Sein <ivan@struktur.de>
Date: Wed, 25 Mar 2015 17:00:59 +0100
Subject: [PATCH 35/56] plugin: only load plugins from user's domain on Mac OS
This patch prevents Iridium from loading plugins that are already
installed on your machine (/Library/Internet Plug-Ins).
So Iridium will only load plugins from user's domain (~/Library/Internet
Plug-Ins).
---
content/common/plugin_list_mac.mm | 3 ---
1 file changed, 3 deletions(-)
diff --git a/content/common/plugin_list_mac.mm b/content/common/plugin_list_mac.mm
index b3d726c..6fa826c 100644
--- a/content/common/plugin_list_mac.mm
+++ b/content/common/plugin_list_mac.mm
@@ -282,9 +282,6 @@ void PluginList::GetPluginDirectories(
// Load from the user's area
GetPluginCommonDirectory(plugin_dirs, true);
-
- // Load from the machine-wide area
- GetPluginCommonDirectory(plugin_dirs, false);
}
void PluginList::GetPluginsInDir(
--
2.4.3

View File

@@ -0,0 +1,32 @@
From 1a5a62b8033e0da98d28f95381c559de24945dbf Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 2 Apr 2015 12:44:23 +0200
Subject: [PATCH 36/56] plugins: use cached copy of plugin description list at
iridiumbrowsing.de
The list contains mimetype-to-plugin mappins, as well as blacklists
for security-impeded old versions of plugins.
To avoid contacing Google, let the UA use the plugin list hosted at
iridiumbrowser. The Iridium project re-gathers these lists on a
regular basis.
---
chrome/browser/plugins/plugins_resource_service.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
index 4dee543..338fe09 100644
--- a/chrome/browser/plugins/plugins_resource_service.cc
+++ b/chrome/browser/plugins/plugins_resource_service.cc
@@ -24,7 +24,7 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
const char kPluginsServerUrl[] =
- "https://www.gstatic.com/chrome/config/plugins_2/";
+ "https://cache.iridiumbrowser.de/";
GURL GetPluginsServerURL() {
std::string filename;
--
2.4.3

View File

@@ -0,0 +1,45 @@
From 154892fb970b8e2a40dbb645822f5fa4533e9a30 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 13 Feb 2015 01:04:21 +0100
Subject: [PATCH 21/56] prefs: always prompt for download directory by default
If the user opens a link, one of two things might happen. The URI
resolves to a "web page" and will be displayed, then everything is
good. Or it has a MIME type like application/* or so that causes the
browser to consider it a file download instead.
In that case, one of two things might happen. The browser may display
a dialog box asking explicitly for an action, then everything is
good. Or it does not and instead readily stores the file on disk.
(Modern browsers also download the file in the background when waiting
for the dialog box confirmation, but that is a separate tuning knob.)
When the file is chosen to be immediately stored on disk without user
interaction, the visual feedback for this may be rather miniscule.
And then, you have to open a terminal or file manager again just to
move the file to the location you wanted it to be in in the first
place.
TLDR: Do not let files sneak onto the disk too easily.
---
chrome/browser/download/download_prefs.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
index f6a3209..3c53280 100644
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -196,7 +196,7 @@ void DownloadPrefs::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kPromptForDownload,
- false,
+ true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterStringPref(prefs::kDownloadExtensionsToOpen, std::string());
registry->RegisterBooleanPref(prefs::kDownloadDirUpgraded, false);
--
2.4.3

View File

@@ -0,0 +1,28 @@
From 24b03184991fc65594739fa88ae262aad5a99072 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 16:43:55 +0200
Subject: [PATCH 15/56] prefs: block third-party cookies by default
Reject extra cookies which are likely used for tracking and whatnot.
There are very few websites which require this, and if you do visit
some, static exceptions can be defined.
---
components/content_settings/core/browser/cookie_settings.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
index 73ba6f6..3d10e98 100644
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -82,7 +82,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
- prefs::kBlockThirdPartyCookies, false,
+ prefs::kBlockThirdPartyCookies, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
--
2.4.3

View File

@@ -0,0 +1,33 @@
From 6b3a3eaa1281feb304635b87273216a6f7e3daf9 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 15:06:39 +0200
Subject: [PATCH 12/56] prefs: disable "Use a prediction service to help
complete searches..."
This autocomplete service would send search queries as soon as you
started typing, even if not yet done typing. Some regard this as an
information leak, others as a waste of bytes sent over the network.
Either reason is fine for me to disable this by default.
Impl. details:
Set suggest_enabled to false by default.
---
chrome/browser/profiles/profile.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 190bb2c..52eb89a 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -76,7 +76,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
#if defined(OS_ANDROID)
registry->RegisterStringPref(
--
2.4.3

View File

@@ -0,0 +1,31 @@
From 1fff8e3b43b6645945abfa88d5bd003b976a8c48 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 11 Sep 2014 16:35:12 +0200
Subject: [PATCH 11/56] prefs: disable "Use a web service to help resolve
navigation errors"
This goes towards reducing promiscuous outbound requests to
some central services.
Impl. details:
Set alternate_error_pages to be disabled by default.
---
chrome/browser/ui/navigation_correction_tab_observer.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
index 6be6a9f..6acc08d 100644
--- a/chrome/browser/ui/navigation_correction_tab_observer.cc
+++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
void NavigationCorrectionTabObserver::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* prefs) {
prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
--
2.4.3

View File

@@ -0,0 +1,27 @@
From 627762c2c770fc9eca5a4169a1af5560eef43ad3 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 16:59:10 +0200
Subject: [PATCH 17/56] prefs: disable background mode by default
If I tell the browser to quit, I mean it. Relinquish the memory,
do not linger around, do not possibly collect data somewhere.
---
chrome/browser/background/background_mode_manager.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 5bd2c6c..465fe13 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -387,7 +387,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
#endif
- registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
+ registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false);
}
void BackgroundModeManager::RegisterProfile(Profile* profile) {
--
2.4.3

View File

@@ -0,0 +1,32 @@
From ada5082c5f81be6eb44d4219e70a11a05dbd5eea Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 17:03:17 +0200
Subject: [PATCH 18/56] prefs: disable hyperlink auditing
"Disable sending hyperlink auditing pings", i.e. pings to
URLs in <a ping="..."> when clicked.
The feature is already switchable through chrome://flags, so no
new UI elements need to be added.
https://html.spec.whatwg.org/multipage/semantics.html#hyperlink-auditing .
---
chrome/browser/chrome_content_browser_client.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index e0a26c8..d7d7e07 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -665,7 +665,7 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
- registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true);
+ registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false);
registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures);
}
--
2.4.3

View File

@@ -0,0 +1,55 @@
From de96c208f8a9a457798d2a309379fcae91e34838 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 15:20:11 +0200
Subject: [PATCH 14/56] prefs: disable network/DNS prediction
Stop wasting my bandwidth (however little), and also don't tell others
what I am about to visit.
---
.../chromium/chrome/browser/preferences/NetworkPredictionOptions.java | 2 +-
chrome/browser/net/prediction_options.cc | 2 +-
chrome/browser/net/prediction_options.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/NetworkPredictionOptions.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/NetworkPredictionOptions.java
index fc8b585..bf8b350 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/NetworkPredictionOptions.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/NetworkPredictionOptions.java
@@ -16,7 +16,7 @@ public enum NetworkPredictionOptions {
NETWORK_PREDICTION_WIFI_ONLY,
NETWORK_PREDICTION_NEVER;
- public static final NetworkPredictionOptions DEFAULT = NETWORK_PREDICTION_WIFI_ONLY;
+ public static final NetworkPredictionOptions DEFAULT = NETWORK_PREDICTION_NEVER;
/**
* @return The number of choices offered for the user.
diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
index 40abb5a..511435b 100644
--- a/chrome/browser/net/prediction_options.cc
+++ b/chrome/browser/net/prediction_options.cc
@@ -25,7 +25,7 @@ bool CanPrefetchAndPrerender(int network_prediction_options) {
case NETWORK_PREDICTION_NEVER:
return false;
default:
- DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options);
+ //DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options);
return !net::NetworkChangeNotifier::IsConnectionCellular(
net::NetworkChangeNotifier::GetConnectionType());
}
diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/prediction_options.h
index 6a2f8df..2edb2cd 100644
--- a/chrome/browser/net/prediction_options.h
+++ b/chrome/browser/net/prediction_options.h
@@ -21,7 +21,7 @@ enum NetworkPredictionOptions {
NETWORK_PREDICTION_ALWAYS,
NETWORK_PREDICTION_WIFI_ONLY,
NETWORK_PREDICTION_NEVER,
- NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_WIFI_ONLY,
+ NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER,
};
void RegisterPredictionOptionsProfilePrefs(
--
2.4.3

View File

@@ -0,0 +1,30 @@
From 95ffd1d9f9e484b50ff8ffba898d9ee303573ae5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 30 Oct 2014 22:04:24 +0100
Subject: [PATCH 25/56] prefs: disable translation service
When translation is enabled, the translation manager will request a
list of supported languages from translate.googleapis.com.
As it is Google, we do not want that, at least not without more
explicit user action. One should visit http://translate.google.com/
instead to request translations via Google.
---
chrome/browser/ui/browser_ui_prefs.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index c4b2204..fa40ad3 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -82,7 +82,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
prefs::kEnableTranslate,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
--
2.4.3

View File

@@ -0,0 +1,25 @@
From 2bfa7c48be5796fedf0a0beb44be37283791981d Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 17:06:40 +0200
Subject: [PATCH 19/56] prefs: do not store passwords by default
---
components/password_manager/core/browser/password_manager.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
index 59cbf96..67b1fbb 100644
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -148,7 +148,7 @@ void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kPasswordManagerSavingEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kCredentialsEnableService, true,
--
2.4.3

View File

@@ -0,0 +1,40 @@
From 6cb9014cba36bd4d626c11a79f2324fb1a42203a Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 15:06:39 +0200
Subject: [PATCH 13/56] prefs: enable "Send a Do-Not-Track header"
Set enable_do_not_track to true by default.
The web community has pointed out (in e.g.
https://news.ycombinator.com/item?id=9483958 ) that defaulting to
DNT=on is "a questionable plan". I agree with that feeling
that DNT becomes useless if everybody has it on.
However, Iridium is order of magnitudes away from "everybody"
currently. We shall reevaluate this in time again.
[The same ycombinator post also quotes section 6.3 of the
https://tools.ietf.org/html/draft-mayer-do-not-track-00#section-6
draft: "It MUST NOT transmit OPT-IN without explicit user consent."
This is ok, because the UA is not sending OPT-IN; it is sending
OPT-OUT.]
---
chrome/browser/ui/browser_ui_prefs.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index 1b25184..d9741ec 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -99,7 +99,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kImportSearchEngine, true);
registry->RegisterBooleanPref(
prefs::kEnableDoNotTrack,
- false,
+ true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
#if defined(ENABLE_WEBRTC)
registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true);
--
2.4.3

Some files were not shown because too many files have changed in this diff Show More