summaryrefslogtreecommitdiff
path: root/chromium/styleguide
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-18 14:10:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-18 13:53:24 +0000
commit813fbf95af77a531c57a8c497345ad2c61d475b3 (patch)
tree821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/styleguide
parentaf6588f8d723931a298c995fa97259bb7f7deb55 (diff)
downloadqtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/styleguide')
-rw-r--r--chromium/styleguide/c++/OWNERS2
-rw-r--r--chromium/styleguide/c++/c++11.html34
2 files changed, 20 insertions, 16 deletions
diff --git a/chromium/styleguide/c++/OWNERS b/chromium/styleguide/c++/OWNERS
index 2157101e1a4..bb9ed6c34f9 100644
--- a/chromium/styleguide/c++/OWNERS
+++ b/chromium/styleguide/c++/OWNERS
@@ -1,3 +1,3 @@
-ajwong@chromium.org
+danakj@chromium.org
jamesr@chromium.org
thakis@chromium.org
diff --git a/chromium/styleguide/c++/c++11.html b/chromium/styleguide/c++/c++11.html
index b7998f90f61..d1b26808d7c 100644
--- a/chromium/styleguide/c++/c++11.html
+++ b/chromium/styleguide/c++/c++11.html
@@ -7,6 +7,7 @@ found in the LICENSE file.
<html>
<head>
<meta charset="utf-8">
+<title>C++11 use in Chromium</title>
<link rel="stylesheet" href="c++11.css">
<style>
table tbody tr td:first-child {
@@ -80,7 +81,7 @@ C++ Templates Angle Brackets Pitfall</a></td>
<td>TODO: documentation link</td>
<td>Use according to the <a
href="https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#auto">Google
-Style Guide on <code>auto</code></a>. <a href="https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/OQyYSfH9m2M">Discussion thread</a></td>
+Style Guide on <code>auto</code></a>. <a href="https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/OQyYSfH9m2M">Discussion thread</a>. <a href="https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/5-Bt3BJzAo0">Another discussion thread</a>.</td>
</tr>
<tr>
@@ -172,6 +173,23 @@ Local types, types without linkage and unnamed types as template arguments</a></
</tr>
<tr>
+<td>Non-Static Class Member Initializers</td>
+<td>
+<code>
+class C {<br />
+ <i>type</i> <i>var</i> = <i>value</i>;<br/>
+ C() // copy-initializes <i>var</i><br/>
+</code>
+<td>Allows non-static class members to be initialized at their definitions (outside constructors)</td>
+<td><a href="http://en.cppreference.com/w/cpp/language/data_members">
+Non-static data members</a></td>
+<td><a href="https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Initialization">Google
+Style Guide</a>.
+<a href="https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/zqB-DySA4V0">Discussion thread</a>
+</td>
+</tr>
+
+<tr>
<td>Null Pointer Constant</td>
<td><code>nullptr</code></td>
<td>Declares a type-safe null pointer</td>
@@ -433,20 +451,6 @@ std::exception</a></td>
</tr>
<tr>
-<td>Non-Static Class Member Initializers</td>
-<td>
-<code>
-class C {<br />
- <i>type</i> <i>var</i> = <i>value</i>;<br/>
- C() // copy-initializes <i>var</i><br/>
-</code>
-<td>Allows non-static class members to be initialized at their definitions (outside constructors)</td>
-<td><a href="http://en.cppreference.com/w/cpp/language/data_members">
-Non-static data members</a></td>
-<td><a href="https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/zqB-DySA4V0">Discussion thread</a></td>
-</tr>
-
-<tr>
<td>Union Class Members</td>
<td><code>union <i>name</i> { <i>class</i> <i>var</i>}</code></td>
<td>Allows class type members</td>