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

Issue 1857983002: Add download_file_types.proto with ascii->binary conversion, as a resource. (Closed)

Created:
4 years, 8 months ago by Nathan Parker
Modified:
4 years, 8 months ago
CC:
arv+watch_chromium.org, chromium-reviews, grt+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Add download_file_types.proto with ascii->binary conversion, as a resource. We'll maintain an ASCII version of the data in the repo, and build the binary version as a Resource at build time. The data will later be updated at runtime. BUG=596555 Committed: https://crrev.com/d57ee6f2e12ac55ac832ca36429545e370467290 Cr-Commit-Position: refs/heads/master@{#386818}

Patch Set 1 #

Total comments: 22

Patch Set 2 : nits, per thestig's review #

Total comments: 9

Patch Set 3 : Moved/rewrote proto comments to README.md #

Total comments: 2

Patch Set 4 : Address asanka's comments #

Patch Set 5 : rebase #

Patch Set 6 : Simplify the proto spec to make .asciipb easier to read #

Total comments: 6

Patch Set 7 : Tweaks to README.md and proto #

Unified diffs Side-by-side diffs Delta from patch set Stats (+349 lines, -3 lines) Patch
M chrome/browser/BUILD.gn View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/browser_resources.grd View 1 chunk +3 lines, -0 lines 0 comments Download
A chrome/browser/resources/safe_browsing/BUILD.gn View 1 1 chunk +38 lines, -0 lines 0 comments Download
A chrome/browser/resources/safe_browsing/README.md View 1 2 3 4 5 6 1 chunk +96 lines, -0 lines 0 comments Download
A chrome/browser/resources/safe_browsing/download_file_types.asciipb View 1 2 3 4 5 6 1 chunk +44 lines, -0 lines 0 comments Download
A chrome/browser/resources/safe_browsing/gen_file_type_proto.py View 1 chunk +59 lines, -0 lines 0 comments Download
M chrome/chrome_common.gypi View 1 2 3 4 2 chunks +4 lines, -3 lines 0 comments Download
M chrome/chrome_resources.gyp View 1 2 chunks +38 lines, -0 lines 0 comments Download
M chrome/common/safe_browsing/BUILD.gn View 1 chunk +1 line, -0 lines 0 comments Download
A chrome/common/safe_browsing/download_file_types.proto View 1 2 3 4 5 6 1 chunk +65 lines, -0 lines 0 comments Download

Messages

Total messages: 20 (5 generated)
Nathan Parker
asanka@ and jialiul@: Please review download_file_types.proto thestig@: Please review the build config changes Thanks!
4 years, 8 months ago (2016-04-04 21:07:25 UTC) #2
Lei Zhang
mostly nitty: https://codereview.chromium.org/1857983002/diff/1/chrome/browser/resources/safe_browsing/BUILD.gn File chrome/browser/resources/safe_browsing/BUILD.gn (right): https://codereview.chromium.org/1857983002/diff/1/chrome/browser/resources/safe_browsing/BUILD.gn#newcode1 chrome/browser/resources/safe_browsing/BUILD.gn:1: # Generate the binary proto form of ...
4 years, 8 months ago (2016-04-04 21:24:48 UTC) #3
Nathan Parker
Thanks thestig! https://codereview.chromium.org/1857983002/diff/1/chrome/browser/resources/safe_browsing/BUILD.gn File chrome/browser/resources/safe_browsing/BUILD.gn (right): https://codereview.chromium.org/1857983002/diff/1/chrome/browser/resources/safe_browsing/BUILD.gn#newcode1 chrome/browser/resources/safe_browsing/BUILD.gn:1: # Generate the binary proto form of ...
4 years, 8 months ago (2016-04-04 22:00:53 UTC) #4
Jialiu Lin
Mostly clarification questions. https://codereview.chromium.org/1857983002/diff/1/chrome/common/safe_browsing/download_file_types.proto File chrome/common/safe_browsing/download_file_types.proto (right): https://codereview.chromium.org/1857983002/diff/1/chrome/common/safe_browsing/download_file_types.proto#newcode4 chrome/common/safe_browsing/download_file_types.proto:4: // empty line instead of the ...
4 years, 8 months ago (2016-04-04 22:05:21 UTC) #6
Nathan Parker
Thanks for the review, jialiul! PTAL. Asanka: I refactored some of the descriptions, and I ...
4 years, 8 months ago (2016-04-05 23:20:31 UTC) #7
Jialiu Lin
lgtm
4 years, 8 months ago (2016-04-05 23:25:38 UTC) #8
Lei Zhang
lgtm
4 years, 8 months ago (2016-04-05 23:39:10 UTC) #9
asanka
I reviewed the earlier patchset, but the comments should be relevant to the new patchset ...
4 years, 8 months ago (2016-04-06 02:12:31 UTC) #10
Nathan Parker
Thanks Asanka. PTAL. https://codereview.chromium.org/1857983002/diff/20001/chrome/common/safe_browsing/download_file_types.proto File chrome/common/safe_browsing/download_file_types.proto (right): https://codereview.chromium.org/1857983002/diff/20001/chrome/common/safe_browsing/download_file_types.proto#newcode25 chrome/common/safe_browsing/download_file_types.proto:25: enum DownloadDangerLevel { On 2016/04/06 02:12:30, ...
4 years, 8 months ago (2016-04-11 20:12:07 UTC) #11
asanka
LGTM w/nits. You can use tools/md_browser to preview Markdown in case you didn't know. https://codereview.chromium.org/1857983002/diff/20001/chrome/common/safe_browsing/download_file_types.proto ...
4 years, 8 months ago (2016-04-11 20:45:03 UTC) #12
Nathan Parker
Thanks! https://codereview.chromium.org/1857983002/diff/100001/chrome/browser/resources/safe_browsing/README.md File chrome/browser/resources/safe_browsing/README.md (right): https://codereview.chromium.org/1857983002/diff/100001/chrome/browser/resources/safe_browsing/README.md#newcode23 chrome/browser/resources/safe_browsing/README.md:23: Leave it unset for 'false'. On 2016/04/11 20:45:03, ...
4 years, 8 months ago (2016-04-12 21:03:42 UTC) #13
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1857983002/120001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1857983002/120001
4 years, 8 months ago (2016-04-12 21:05:20 UTC) #16
commit-bot: I haz the power
Committed patchset #7 (id:120001)
4 years, 8 months ago (2016-04-12 21:55:46 UTC) #17
commit-bot: I haz the power
Patchset 7 (id:??) landed as https://crrev.com/d57ee6f2e12ac55ac832ca36429545e370467290 Cr-Commit-Position: refs/heads/master@{#386818}
4 years, 8 months ago (2016-04-12 21:58:51 UTC) #19
Not at Google. Contact bengr
4 years, 8 months ago (2016-04-12 23:07:24 UTC) #20
Message was sent while issue was closed.
A revert of this CL (patchset #7 id:120001) has been created in
https://codereview.chromium.org/1881273002/ by kundaji@chromium.org.

The reason for reverting is: This cl is breaking  Android Debug (Nexus 5):
https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus...

Error log:
FAILED: python
../../chrome/browser/resources/safe_browsing/gen_file_type_proto.py -i
../../chrome/browser/resources/safe_browsing/download_file_types.asciipb -o
gen/chrome/browser/resources/safe_browsing/download_file_types.pb -p
pyproto/chrome/common/safe_browsing
Traceback (most recent call last):
  File "../../chrome/browser/resources/safe_browsing/gen_file_type_proto.py",
line 13, in <module>
    import google.protobuf.text_format as text_format
ImportError: No module named google.protobuf.text_format
ninja: build stopped: subcommand failed..

Powered by Google App Engine
This is Rietveld 408576698