From 196290aaaa7547cd161a244556d26403255842f0 Mon Sep 17 00:00:00 2001 From: brettw Date: Wed, 6 Jul 2016 20:52:16 -0700 Subject: [PATCH] Minor fixes to C++ style guide. Link to GN style guide fixed. Added a link to the general C++ style guide from the C++11-specific page. Text on both the C++ and C++11 pages updated to remove a reference to the wiki (presumably it's referrring to "this page") and instead say to make a CL when there is concensus. Review-Url: https://codereview.chromium.org/2128723002 Cr-Commit-Position: refs/heads/master@{#404066} --- styleguide/c++/c++.md | 6 +++--- styleguide/c++/c++11.html | 5 ++++- styleguide/styleguide.md | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/styleguide/c++/c++.md b/styleguide/c++/c++.md index 1b8e307bbdc580..e7af38be86bd1f 100644 --- a/styleguide/c++/c++.md +++ b/styleguide/c++/c++.md @@ -11,9 +11,9 @@ A checkout should give you to automatically format C++ code. By policy, Clang's formatting of code should always be accepted in code reviews. -You can propose changes to the style guide by sending an email to -`cxx@chromium.org`. Ideally, the list will arrive at some consensus and the -wiki page will be updated to mention that consensus. If there's no consensus, +You can propose changes to this style guide by sending an email to +`cxx@chromium.org`. Ideally, the list will arrive at some consensus and you can +request review for a change to this file. If there's no consensus, `src/styleguide/c++/OWNERS` get to decide. Blink code in `third_party/WebKit` uses [Blink diff --git a/styleguide/c++/c++11.html b/styleguide/c++/c++11.html index 1ffc465db94014..3b2c81eb0346ef 100644 --- a/styleguide/c++/c++11.html +++ b/styleguide/c++/c++11.html @@ -29,12 +29,15 @@

C++11 use in Chromium

Guide applies to Chromium and its subprojects. Subprojects can choose to be more restrictive if they need to compile on more toolchains than Chromium.

+

This page comprises part of the more general +Chromium C++ style guide.

+

You can propose to make a feature available or to ban a feature by sending an email to cxx@chromium.org. Ideally include a short blurb on what the feature is, and why you think it should or should not be allowed. Ideally, the list will arrive at some -consensus and the wiki page will be updated to mention that consensus. If +consensus and you can request review for a change to this file. If there's no consensus, src/styleguide/c++/OWNERS get to decide -- for divisive features, we expect the decision to be to not use the feature yet and possibly discuss it again a few months later, when we have more experience diff --git a/styleguide/styleguide.md b/styleguide/styleguide.md index cbe31122183091..7a9429a691590e 100644 --- a/styleguide/styleguide.md +++ b/styleguide/styleguide.md @@ -5,7 +5,7 @@ * [Chromium C++ style guide](c++/c++.md) * [Google Objective-C style guide](https://google.github.io/styleguide/objcguide.xml) * [Java style guide for Android](https://sites.google.com/a/chromium.org/dev/developers/coding-style/java) - * [GN style guide](https://chromium.googlesource.com/chromium/src/+/master/tool) for build files + * [GN style guide](../tools/gn/docs/style_guide.md) for build files Chromium also uses these languages to a lesser degree: