Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/static/js/framework/clientmon.js b/static/js/framework/clientmon.js
index aa6dc0a..f198849 100644
--- a/static/js/framework/clientmon.js
+++ b/static/js/framework/clientmon.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
(function(window) {
'use strict';
diff --git a/static/js/framework/env.js b/static/js/framework/env.js
index baf19cb..445f2fa 100644
--- a/static/js/framework/env.js
+++ b/static/js/framework/env.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
/**
* @fileoverview Defines the type of the CS_env Javascript object
diff --git a/static/js/framework/externs.js b/static/js/framework/externs.js
index a0375a1..defb115 100644
--- a/static/js/framework/externs.js
+++ b/static/js/framework/externs.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
/** @type {CS.env} */
var CS_env;
diff --git a/static/js/framework/framework-ajax.js b/static/js/framework/framework-ajax.js
index 038c4c3..7fe8a91 100644
--- a/static/js/framework/framework-ajax.js
+++ b/static/js/framework/framework-ajax.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
/**
diff --git a/static/js/framework/framework-ajax_test.js b/static/js/framework/framework-ajax_test.js
index c5218d3..c3025e5 100644
--- a/static/js/framework/framework-ajax_test.js
+++ b/static/js/framework/framework-ajax_test.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
/**
* @fileoverview Tests for framework-ajax.js.
diff --git a/static/js/framework/framework-cues.js b/static/js/framework/framework-cues.js
index 2c620a1..11d10ac 100644
--- a/static/js/framework/framework-cues.js
+++ b/static/js/framework/framework-cues.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
/**
* @fileoverview Simple functions for dismissible on-page help ("cues").
diff --git a/static/js/framework/framework-display.js b/static/js/framework/framework-display.js
index 9213e82..10e7ed0 100644
--- a/static/js/framework/framework-display.js
+++ b/static/js/framework/framework-display.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
/**
* Functions used by the Project Hosting to control the display of
diff --git a/static/js/framework/framework-menu.js b/static/js/framework/framework-menu.js
index 35bbebc..01dc621 100644
--- a/static/js/framework/framework-menu.js
+++ b/static/js/framework/framework-menu.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
/**
* @fileoverview This file represents a standalone, reusable drop down menu
diff --git a/static/js/framework/framework-myhotlists.js b/static/js/framework/framework-myhotlists.js
index 6459090..8ac0dc7 100644
--- a/static/js/framework/framework-myhotlists.js
+++ b/static/js/framework/framework-myhotlists.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
/**
* @fileoverview This file initializes the "My Hotlists" drop down menu in the
diff --git a/static/js/framework/framework-stars.js b/static/js/framework/framework-stars.js
index 946264e..f8035f4 100644
--- a/static/js/framework/framework-stars.js
+++ b/static/js/framework/framework-stars.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
/**
* This file contains JS functions that support setting and showing
diff --git a/static/js/framework/project-name-check.js b/static/js/framework/project-name-check.js
index 65c2bdf..b012e36 100644
--- a/static/js/framework/project-name-check.js
+++ b/static/js/framework/project-name-check.js
@@ -1,9 +1,6 @@
-/* Copyright 2016 The Chromium Authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file or at
- * https://developers.google.com/open-source/licenses/bsd
- */
+// Copyright 2016 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
/**
* @fileoverview Functions that support project name checks when