diff options
| author | Daniel Cheng <dcheng@chromium.org> | 2014-10-06 20:22:19 -0700 |
|---|---|---|
| committer | Daniel Cheng <dcheng@chromium.org> | 2014-10-07 03:23:01 +0000 |
| commit | d42a8f8372389ff80a2f0f55b8826318a6ed2c93 (patch) | |
| tree | 21d3f15ac47b219ac38c0aaf59fd3ed0855d8049 | |
| parent | d974ccd44609e4c7e4412f1af80818b81504851f (diff) | |
| download | chromium_src-d42a8f8372389ff80a2f0f55b8826318a6ed2c93.zip chromium_src-d42a8f8372389ff80a2f0f55b8826318a6ed2c93.tar.gz chromium_src-d42a8f8372389ff80a2f0f55b8826318a6ed2c93.tar.bz2 | |
Rewrite line endings from CRLF to LF for a bunch of files.
There's a lot of other files with CRLF line endings in test data,
third_party, and tools. Out of caution, those files have been left
unchanged, in case anything depends on the CRLF being present.
BUG=420796
TBR=darin@chromium.org, rsleevi@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/630333002
Cr-Commit-Position: refs/heads/master@{#298348}
29 files changed, 956 insertions, 956 deletions
diff --git a/chrome/browser/extensions/extension_message_bubble.h b/chrome/browser/extensions/extension_message_bubble.h index bdce711..71d6e30 100644 --- a/chrome/browser/extensions/extension_message_bubble.h +++ b/chrome/browser/extensions/extension_message_bubble.h @@ -1,34 +1,34 @@ -// Copyright (c) 2013 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.
-
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_H_
-
-#include "base/bind.h"
-
-class Browser;
-
-namespace extensions {
-
-// The interface between the SuspiciousExtensionBubble bubble and its
-// controller.
-class ExtensionMessageBubble {
- public:
- // Setup the callback for when the action button is clicked in the
- // bubble.
- virtual void OnActionButtonClicked(const base::Closure& callback) = 0;
-
- // Setup the callback for when the dismiss button is clicked.
- virtual void OnDismissButtonClicked(const base::Closure& callback) = 0;
-
- // Setup the callback for when the link is clicked in the bubble.
- virtual void OnLinkClicked(const base::Closure& callback) = 0;
-
- // Instruct the bubble to appear.
- virtual void Show() = 0;
-};
-
-} // namespace extensions
-
-#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_H_
+// Copyright (c) 2013 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. + +#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_H_ +#define CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_H_ + +#include "base/bind.h" + +class Browser; + +namespace extensions { + +// The interface between the SuspiciousExtensionBubble bubble and its +// controller. +class ExtensionMessageBubble { + public: + // Setup the callback for when the action button is clicked in the + // bubble. + virtual void OnActionButtonClicked(const base::Closure& callback) = 0; + + // Setup the callback for when the dismiss button is clicked. + virtual void OnDismissButtonClicked(const base::Closure& callback) = 0; + + // Setup the callback for when the link is clicked in the bubble. + virtual void OnLinkClicked(const base::Closure& callback) = 0; + + // Instruct the bubble to appear. + virtual void Show() = 0; +}; + +} // namespace extensions + +#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_H_ diff --git a/chrome/browser/google/OWNERS b/chrome/browser/google/OWNERS index 313ac5f..2c1c5e2 100644 --- a/chrome/browser/google/OWNERS +++ b/chrome/browser/google/OWNERS @@ -1,2 +1,2 @@ -isherman@chromium.org
+isherman@chromium.org pkasting@chromium.org
\ No newline at end of file diff --git a/chrome/browser/profiles/file_path_verifier_win_unittest.cc b/chrome/browser/profiles/file_path_verifier_win_unittest.cc index e2c922f..a705357 100644 --- a/chrome/browser/profiles/file_path_verifier_win_unittest.cc +++ b/chrome/browser/profiles/file_path_verifier_win_unittest.cc @@ -1,40 +1,40 @@ -// Copyright 2013 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.
-
-#include "chrome/browser/profiles/file_path_verifier_win.h"
-
-#include "base/files/file_path.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-TEST(FilePathVerifierTest, ComparePathsIgnoreCase) {
- const struct PathComparisonReasonTestData {
- const base::FilePath::CharType* inputs[2];
- internal::PathComparisonReason expected;
- } cases[] = {
- { { FILE_PATH_LITERAL("test/foo.bar"),
- FILE_PATH_LITERAL("test/foo.bar") },
- internal::PATH_COMPARISON_EQUAL},
- { { FILE_PATH_LITERAL("test\\foo.bar"),
- FILE_PATH_LITERAL("test\\foo.bar") },
- internal::PATH_COMPARISON_EQUAL},
- { { FILE_PATH_LITERAL("test/foo.bar"),
- FILE_PATH_LITERAL("test/foo.baz") },
- internal::PATH_COMPARISON_FAILED_SAMEDIR},
- { { FILE_PATH_LITERAL("test/foo.bar"),
- FILE_PATH_LITERAL("test/joe/foo.bar") },
- internal::PATH_COMPARISON_FAILED_SAMEBASE},
- { { FILE_PATH_LITERAL("test/foo.bar"),
- FILE_PATH_LITERAL("jack/bar.buz") },
- internal::PATH_COMPARISON_FAILED_UNKNOWN},
- };
-
- for (size_t i = 0; i < arraysize(cases); ++i) {
- base::FilePath p1(cases[i].inputs[0]);
- base::FilePath p2(cases[i].inputs[1]);
- internal::PathComparisonReason reason =
- internal::ComparePathsIgnoreCase(p1, p2);
- EXPECT_EQ(cases[i].expected, reason) <<
- "i: " << i << ", p1: " << p1.value() << ", p2: " << p2.value();
- }
-}
+// Copyright 2013 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. + +#include "chrome/browser/profiles/file_path_verifier_win.h" + +#include "base/files/file_path.h" +#include "testing/gtest/include/gtest/gtest.h" + +TEST(FilePathVerifierTest, ComparePathsIgnoreCase) { + const struct PathComparisonReasonTestData { + const base::FilePath::CharType* inputs[2]; + internal::PathComparisonReason expected; + } cases[] = { + { { FILE_PATH_LITERAL("test/foo.bar"), + FILE_PATH_LITERAL("test/foo.bar") }, + internal::PATH_COMPARISON_EQUAL}, + { { FILE_PATH_LITERAL("test\\foo.bar"), + FILE_PATH_LITERAL("test\\foo.bar") }, + internal::PATH_COMPARISON_EQUAL}, + { { FILE_PATH_LITERAL("test/foo.bar"), + FILE_PATH_LITERAL("test/foo.baz") }, + internal::PATH_COMPARISON_FAILED_SAMEDIR}, + { { FILE_PATH_LITERAL("test/foo.bar"), + FILE_PATH_LITERAL("test/joe/foo.bar") }, + internal::PATH_COMPARISON_FAILED_SAMEBASE}, + { { FILE_PATH_LITERAL("test/foo.bar"), + FILE_PATH_LITERAL("jack/bar.buz") }, + internal::PATH_COMPARISON_FAILED_UNKNOWN}, + }; + + for (size_t i = 0; i < arraysize(cases); ++i) { + base::FilePath p1(cases[i].inputs[0]); + base::FilePath p2(cases[i].inputs[1]); + internal::PathComparisonReason reason = + internal::ComparePathsIgnoreCase(p1, p2); + EXPECT_EQ(cases[i].expected, reason) << + "i: " << i << ", p1: " << p1.value() << ", p2: " << p2.value(); + } +} diff --git a/chrome/browser/resources/extensions_infobar.css b/chrome/browser/resources/extensions_infobar.css index 6cfd064..7b8cc42 100644 --- a/chrome/browser/resources/extensions_infobar.css +++ b/chrome/browser/resources/extensions_infobar.css @@ -2,15 +2,15 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -/**
- * The following style rules affect Extension Infobars.
- */
-
-body {
- background: -webkit-linear-gradient(#E9E9E9, #DADADA);
- font-family: Segoe UI, Tahoma;
- font-size: 11px;
- height: 36px; /* Infobars are limited to 36-72px */
- margin: 0;
- overflow: hidden;
-}
+/** + * The following style rules affect Extension Infobars. + */ + +body { + background: -webkit-linear-gradient(#E9E9E9, #DADADA); + font-family: Segoe UI, Tahoma; + font-size: 11px; + height: 36px; /* Infobars are limited to 36-72px */ + margin: 0; + overflow: hidden; +} diff --git a/chrome/browser/resources/net_internals/OWNERS b/chrome/browser/resources/net_internals/OWNERS index 0ab96e3..e89a2d2 100644 --- a/chrome/browser/resources/net_internals/OWNERS +++ b/chrome/browser/resources/net_internals/OWNERS @@ -1,2 +1,2 @@ -eroman@chromium.org
-mmenke@chromium.org
+eroman@chromium.org +mmenke@chromium.org diff --git a/chrome/browser/services/gcm/gcm_app_handler.h b/chrome/browser/services/gcm/gcm_app_handler.h index 6777c68..b5a9e06 100644 --- a/chrome/browser/services/gcm/gcm_app_handler.h +++ b/chrome/browser/services/gcm/gcm_app_handler.h @@ -1,12 +1,12 @@ -// Copyright (c) 2014 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.
-
-#ifndef CHROME_BROWSER_SERVICES_GCM_GCM_APP_HANDLER_H_
-#define CHROME_BROWSER_SERVICES_GCM_GCM_APP_HANDLER_H_
-
-// Temporary workaround to make code depends on gcm_app_handler in old location
-// build.
-#include "components/gcm_driver/gcm_app_handler.h"
-
-#endif // CHROME_BROWSER_SERVICES_GCM_GCM_APP_HANDLER_H_
+// Copyright (c) 2014 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. + +#ifndef CHROME_BROWSER_SERVICES_GCM_GCM_APP_HANDLER_H_ +#define CHROME_BROWSER_SERVICES_GCM_GCM_APP_HANDLER_H_ + +// Temporary workaround to make code depends on gcm_app_handler in old location +// build. +#include "components/gcm_driver/gcm_app_handler.h" + +#endif // CHROME_BROWSER_SERVICES_GCM_GCM_APP_HANDLER_H_ diff --git a/chrome/browser/ui/ash/OWNERS b/chrome/browser/ui/ash/OWNERS index 2974e85..1ae5c70 100644 --- a/chrome/browser/ui/ash/OWNERS +++ b/chrome/browser/ui/ash/OWNERS @@ -1,4 +1,4 @@ -derat@chromium.org
-jamescook@chromium.org
-oshima@chromium.org
-sky@chromium.org
+derat@chromium.org +jamescook@chromium.org +oshima@chromium.org +sky@chromium.org diff --git a/chrome/browser/ui/omnibox/OWNERS b/chrome/browser/ui/omnibox/OWNERS index f8c6d72..3363c14 100644 --- a/chrome/browser/ui/omnibox/OWNERS +++ b/chrome/browser/ui/omnibox/OWNERS @@ -1,2 +1,2 @@ -pkasting@chromium.org
-sky@chromium.org
+pkasting@chromium.org +sky@chromium.org diff --git a/chrome/browser/ui/search_engines/OWNERS b/chrome/browser/ui/search_engines/OWNERS index f8c6d72..3363c14 100644 --- a/chrome/browser/ui/search_engines/OWNERS +++ b/chrome/browser/ui/search_engines/OWNERS @@ -1,2 +1,2 @@ -pkasting@chromium.org
-sky@chromium.org
+pkasting@chromium.org +sky@chromium.org diff --git a/chrome/browser/ui/views/ash/OWNERS b/chrome/browser/ui/views/ash/OWNERS index 6bd5860..4d44716 100644 --- a/chrome/browser/ui/views/ash/OWNERS +++ b/chrome/browser/ui/views/ash/OWNERS @@ -1,3 +1,3 @@ -derat@chromium.org
-jamescook@chromium.org
-sky@chromium.org
+derat@chromium.org +jamescook@chromium.org +sky@chromium.org diff --git a/chrome/browser/ui/webui/net_internals/OWNERS b/chrome/browser/ui/webui/net_internals/OWNERS index 0ab96e3..e89a2d2 100644 --- a/chrome/browser/ui/webui/net_internals/OWNERS +++ b/chrome/browser/ui/webui/net_internals/OWNERS @@ -1,2 +1,2 @@ -eroman@chromium.org
-mmenke@chromium.org
+eroman@chromium.org +mmenke@chromium.org diff --git a/chrome/browser/web_applications/OWNERS b/chrome/browser/web_applications/OWNERS index b5105ef..ce77cd1 100644 --- a/chrome/browser/web_applications/OWNERS +++ b/chrome/browser/web_applications/OWNERS @@ -1,4 +1,4 @@ -benwells@chromium.org
+benwells@chromium.org tapted@chromium.org # Windows diff --git a/chrome/installer/setup/eula/oem.css b/chrome/installer/setup/eula/oem.css index 3d30301..bf7d950 100644 --- a/chrome/installer/setup/eula/oem.css +++ b/chrome/installer/setup/eula/oem.css @@ -1,52 +1,52 @@ -html {
- overflow:auto;
-}
-body, td {
- overflow:auto;
- margin:0px;
- font-family:arial;
- font-size:84%;
-}
-.header {
- background-color:#d8dfea;
- padding:10px 10px 10px 8px;
-}
-.icontext {
- text-align:center;
- font-family:tahoma;
- font-size:11px;
- padding:1px 0px 0px 2px;
-}
-.title {
- font-size:115%;
- font-weight:bold;
-}
-.desc {
- display:block;
- padding-top:5px;
-}
-.main {
- margin:17px 13px 0px 14px;
-}
-.eula {
- margin:5px 10px 0px 5px;
-}
-iframe {
- border:1px solid #999999;
-}
-.footer {
- position:absolute;
- bottom:0px;
- padding:5px 5px 5px 5px;
-}
-form {
- margin:0px;
- padding:0px;
-}
-.labelcell {
- padding-top:2px;
-}
-.buttons {
- margin:8px 5px 0px 5px;
- text-align:right;
+html { + overflow:auto; +} +body, td { + overflow:auto; + margin:0px; + font-family:arial; + font-size:84%; +} +.header { + background-color:#d8dfea; + padding:10px 10px 10px 8px; +} +.icontext { + text-align:center; + font-family:tahoma; + font-size:11px; + padding:1px 0px 0px 2px; +} +.title { + font-size:115%; + font-weight:bold; +} +.desc { + display:block; + padding-top:5px; +} +.main { + margin:17px 13px 0px 14px; +} +.eula { + margin:5px 10px 0px 5px; +} +iframe { + border:1px solid #999999; +} +.footer { + position:absolute; + bottom:0px; + padding:5px 5px 5px 5px; +} +form { + margin:0px; + padding:0px; +} +.labelcell { + padding-top:2px; +} +.buttons { + margin:8px 5px 0px 5px; + text-align:right; }
\ No newline at end of file diff --git a/chrome/tools/tracing/trace.html b/chrome/tools/tracing/trace.html index f6dd14c..a86fa1c 100644 --- a/chrome/tools/tracing/trace.html +++ b/chrome/tools/tracing/trace.html @@ -1,395 +1,395 @@ -<!--
-Tracing template
-----------------
-Test_shell has an optional tracing feature. It can be enabled by running
-with the --enable-tracing option. Tracing causes events to be dropped into
-a trace file during runtime.
-
-This HTML file can be used to render the output from the trace. You'll need
-to rename your trace data to "trace_data.js" in the same directory with this
-HTML file, and then you can visualize the trace.
-
-Lots of work remains on this tracing tool; currently development is on hold.
-
--->
-
-<html>
-<head>
-<title>
-Trace Events
-</title>
-<style>
-body {
- font-family: "Courier New";
- font-size: 9pt;
-}
-
-#header {
- position: absolute;
- top: 0px;
- left: 0px;
- border-bottom: 1px dashed black;
- background-color: #F0F0F0;
- z-index: 3;
-}
-
-#outer {
- position: relative;
- height: 200px;
-}
-
-#time_scale {
- height: 15px;
- width: 100%;
-}
-
-#tooltip {
- position: absolute;
- background-color: #FFFFCC;
- display: none;
- font-family: "Courier New";
- font-size: 9pt;
- padding: 5px;
- border: 1px solid #CCCC88;
- z-index: 3;
-}
-
-#legend {
- position: fixed;
- left: 10px;
- bottom: 10px;
- padding: 5px;
- border: 1px solid silver;
- z-index: 10;
- background-color: #f0f0f0;
-}
-
-h2 {
- margin: 5px;
-}
-
-#instructions {
- position: absolute;
- top:
- float: right;
- display: none;
-}
-
-li.time_tick {
- background-color: #FFFFCC;
- height: 15px;
-}
-
-li {
- background: pink;
- position: absolute;
- height: 10px;
- list-style: none;
- margin: 0px;
- padding: 0px;
- z-index: 2;
-}
-
-li:hover {
- border: 1px solid red;
-}
-
-.url {
- background-color: green;
-}
-
-.http {
- background-color: blue;
-}
-
-.socket {
- background-color: black;
-}
-
-.v8 {
- background-color: orange;
-}
-
-.loop {
- background-color: gray;
-}
-
-.io {
- background-color: blue;
-}
-
-</style>
-
-<script src='trace_data.js'></script>
-<script>
-var scale = 100000;
-var row_height = 15;
-var trace_initial_time = 0;
-var trace_threads = {};
-var heartbeats = [];
-var trace_total_time = 0;
-
-function process_raw_events() {
- trace_initial_time = raw_trace_events[0].usec_begin;
- var stack = [];
- var e;
- for (var i in raw_trace_events) {
- e = raw_trace_events[i];
- var trace_events = trace_threads["e.tid"];
- if (!trace_events) {
- trace_events = [];
- trace_threads["e.tid"] = trace_events;
- }
- if (e.name.indexOf("heartbeat.") == 0) {
- heartbeats.push(e);
- } else if (e.type == "BEGIN") {
- trace_events.push(e);
- stack.unshift(e);
- } else if (e.type == "END") {
- for (var s in stack) {
- var begin = stack[s];
- if ((begin.id == e.id) && (begin.name == e.name) &&
- (begin.pid == e.pid) && (begin.tid == e.tid)) {
- begin.usec_end = e.usec_begin;
- begin.duration = begin.usec_end - begin.usec_begin;
- begin.extra += " " + e.extra;
- stack.splice(s, 1);
- break;
- }
- }
- } else if (e.type == "INSTANT") {
- trace_events.push(e);
- e.duration = 0;
- }
- }
- if (e.usec_end)
- trace_total_time = e.usec_end - trace_initial_time;
- else
- trace_total_time = e.usec_begin - trace_initial_time;
-}
-
-function compute_scale() {
- var outer = document.getElementById("outer");
- scale = Math.floor(trace_total_time / (outer.offsetWidth - (row_height * 2)));
-};
-
-function show_details(tid, i, event) {
- var trace_events = trace_threads["e.tid"];
- var inner = trace_events[i].name + " " +
- trace_events[i].duration / 1000 + "ms<br />" +
- trace_events[i].id + "<br />" +
- trace_events[i].extra + "<br />";
- var tooltip = document.getElementById("tooltip");
- tooltip.innerHTML = inner;
- if (window.event)
- event = window.event;
- tooltip.style.top = event.pageY + 3;
- tooltip.style.left = event.pageX + 3;
- tooltip.style.display = "block";
-};
-
-function generate_time_scale() {
- var view_size = window.clientWidth;
- var body_size = document.body.scrollWidth;
- var inner = "";
-
- var step_ms = Math.floor(scale / 10); // ms per 100px
- var pow10 = Math.pow(10, Math.floor(Math.log(step_ms) / Math.log(10)));
- var round = .5 * pow10;
- step_ms = round * (Math.floor(step_ms / round)); // round to a multiple of round
- for (var i = step_ms; i < trace_total_time / 1000; i += step_ms) {
- var x = Math.floor(i * 1000 / scale);
- inner += "<li class='time_tick' style='left: " + x + "px'>" + i + "</li>";
- }
- var time_scale = document.getElementById("time_scale");
- time_scale.innerHTML = inner;
- time_scale.style.width = document.body.scrollWidth;
-}
-
-function generate_io_graph(trace_events, top) {
- var max_height = 200;
- var bucket_size = 50000; // millisecs
-
- var inner = "";
- var buckets = new Array();
- var value = 0;
- var max_bucket = 0;
-
- // Go through events and find all read samples.
- // Aggregate data into buckets.
- for (var i in trace_events) {
- var e = trace_events[i];
- if (e.name != "socket.read") {
- continue;
- }
-
- var bytes = parseInt(e.extra);
-// bytes = 400;
-
- var start_time = e.usec_begin - trace_initial_time;
- var mybucket = Math.floor(start_time / bucket_size);
-
- if (buckets[mybucket] == undefined) {
- buckets[mybucket] = 0;
- }
- buckets[mybucket] += bytes;
-
- if (buckets[max_bucket] == undefined ||
- buckets[max_bucket] < buckets[mybucket]) {
- max_bucket = mybucket;
- }
- }
-
- for (var index = 0; index < buckets.length; index++) {
- var left = index * Math.floor(bucket_size / scale);
- var width = Math.floor(bucket_size / scale);
- if (width == 0)
- width = 1;
-
- var height;
- if (buckets[index] == undefined) {
- height = 0;
- } else {
- height = (buckets[index] / buckets[max_bucket]) * max_height;
- }
-
- var my_top = max_height - height;
-
- var style = "top: " + my_top + "px; left: " + left + "px; width: " + width + "px; height:" + height + "px;";
- var cls = "io";
- inner += "<li title='" + buckets[index] + " bytes' class='" + cls + "' id='li-" + i + "' style='" + style + "'></li>\n";
- }
-
- var subchart = document.createElement('div');
- subchart.setAttribute("class", "iograph");
- subchart.setAttribute("id", trace_events[0].tid);
- subchart.innerHTML = inner;
- subchart.style.height = max_height;
- subchart.style.top = top;
- subchart.style.left = 0;
- subchart.style.position = "absolute";
-// subchart.style.width = row_height + last_max_x;
- var chart = document.getElementById("chart");
- chart.appendChild(subchart);
-
- return top + max_height;
-}
-
-function generate_subchart(trace_events, top) {
- var start_top = top;
- var heights = new Array();
- var max_row = 0;
- var inner = "";
- var last_max_time = 0;
- var last_max_x = 0;
- for (var i in trace_events) {
- var e = trace_events[i];
- var start_time = e.usec_begin - trace_initial_time;
- var left = row_height + Math.floor(start_time / scale);
- var width = Math.floor(e.duration / scale);
- if (width == 0)
- width = 1;
-
- if (heights[e.id]) {
- top = heights[e.id];
- } else {
- max_row += row_height;
- heights[e.id] = max_row;
- top = heights[e.id];
- }
- //if (start_time < last_max_time)
- // top += row_height;
- var style = "top: " + top + "px; left: " + left + "px; width: " + width + "px;";
- var js = 'javascript:show_details("' + e.tid + '", ' + i + ', event);';
- var cls = e.name.split('.')[0];
- inner += "<li class='" + cls + "' onmouseover='" + js + "' id='li-" + i + "' style='" + style + "'></li>\n";
- last_max_time = start_time + e.duration;
- last_max_x = left + width;
- }
- var subchart = document.createElement('div');
- subchart.setAttribute("class", "subchart");
- subchart.setAttribute("id", trace_events[0].tid);
- subchart.innerHTML = inner;
- subchart.style.top = start_top + "px";
- subchart.style.height = top + row_height;
- subchart.style.width = row_height + last_max_x;
- subchart.style.position = "absolute";
- var chart = document.getElementById("chart");
- chart.appendChild(subchart);
-
- return top;
-};
-
-function generate_chart() {
- var chart = document.getElementById("chart");
- chart.innerHTML = "";
- var top = 60;
- for (var t in trace_threads) {
- top = generate_io_graph(trace_threads[t], top);
- top = generate_subchart(trace_threads[t], top);
- }
- generate_time_scale();
-}
-
-function change_scale(event) {
- if (!event)
- event = window.event;
- if (!event.shiftKey)
- return;
- var delta = 0;
- if (event.wheelDelta) {
- delta = event.wheelDelta / 120;
- } else if (event.detail) {
- delta = - event.detail / 3;
- }
- if (delta) {
- var tooltip = document.getElementById("tooltip");
- tooltip.style.display = "none";
- var factor = 1.1;
- if (delta < 0)
- scale = Math.floor(scale * factor);
- else
- scale = Math.floor(scale / factor);
- if (scale > 300000)
- scale = 300000;
- generate_chart();
- if (event.preventDefault)
- event.preventDefault();
- }
- event.returnValue = false;
-};
-
-function initial_load() {
- if (window.addEventListener)
- window.addEventListener('DOMMouseScroll', change_scale, false);
- window.onmousewheel = document.onmousewheel = change_scale;
-
- process_raw_events();
- compute_scale();
- generate_chart();
-};
-
-</script>
-</head>
-<body onload='initial_load();'>
-<div id="header">
-<h2>Trace Events</h2>
-<div id="instructions">
-Use shift+mouse-wheel to zoom in and out.
-</div>
-<div id="time_scale"></div>
-</div>
-<div id="legend">
-<span class="url"> </span> URL<br />
-<span class="http"> </span> HTTP<br />
-<span class="socket"> </span> Socket<br />
-<span class="v8"> </span> V8<br />
-<span class="loop"> </span> TASKS<br />
-</div>
-<div id="chart">
-<div id="outer">
-</div>
-</div>
-<div id="tooltip" ondblclick="this.style.display = 'none';"></div>
-</body>
-</html>
+<!-- +Tracing template +---------------- +Test_shell has an optional tracing feature. It can be enabled by running +with the --enable-tracing option. Tracing causes events to be dropped into +a trace file during runtime. + +This HTML file can be used to render the output from the trace. You'll need +to rename your trace data to "trace_data.js" in the same directory with this +HTML file, and then you can visualize the trace. + +Lots of work remains on this tracing tool; currently development is on hold. + +--> + +<html> +<head> +<title> +Trace Events +</title> +<style> +body { + font-family: "Courier New"; + font-size: 9pt; +} + +#header { + position: absolute; + top: 0px; + left: 0px; + border-bottom: 1px dashed black; + background-color: #F0F0F0; + z-index: 3; +} + +#outer { + position: relative; + height: 200px; +} + +#time_scale { + height: 15px; + width: 100%; +} + +#tooltip { + position: absolute; + background-color: #FFFFCC; + display: none; + font-family: "Courier New"; + font-size: 9pt; + padding: 5px; + border: 1px solid #CCCC88; + z-index: 3; +} + +#legend { + position: fixed; + left: 10px; + bottom: 10px; + padding: 5px; + border: 1px solid silver; + z-index: 10; + background-color: #f0f0f0; +} + +h2 { + margin: 5px; +} + +#instructions { + position: absolute; + top: + float: right; + display: none; +} + +li.time_tick { + background-color: #FFFFCC; + height: 15px; +} + +li { + background: pink; + position: absolute; + height: 10px; + list-style: none; + margin: 0px; + padding: 0px; + z-index: 2; +} + +li:hover { + border: 1px solid red; +} + +.url { + background-color: green; +} + +.http { + background-color: blue; +} + +.socket { + background-color: black; +} + +.v8 { + background-color: orange; +} + +.loop { + background-color: gray; +} + +.io { + background-color: blue; +} + +</style> + +<script src='trace_data.js'></script> +<script> +var scale = 100000; +var row_height = 15; +var trace_initial_time = 0; +var trace_threads = {}; +var heartbeats = []; +var trace_total_time = 0; + +function process_raw_events() { + trace_initial_time = raw_trace_events[0].usec_begin; + var stack = []; + var e; + for (var i in raw_trace_events) { + e = raw_trace_events[i]; + var trace_events = trace_threads["e.tid"]; + if (!trace_events) { + trace_events = []; + trace_threads["e.tid"] = trace_events; + } + if (e.name.indexOf("heartbeat.") == 0) { + heartbeats.push(e); + } else if (e.type == "BEGIN") { + trace_events.push(e); + stack.unshift(e); + } else if (e.type == "END") { + for (var s in stack) { + var begin = stack[s]; + if ((begin.id == e.id) && (begin.name == e.name) && + (begin.pid == e.pid) && (begin.tid == e.tid)) { + begin.usec_end = e.usec_begin; + begin.duration = begin.usec_end - begin.usec_begin; + begin.extra += " " + e.extra; + stack.splice(s, 1); + break; + } + } + } else if (e.type == "INSTANT") { + trace_events.push(e); + e.duration = 0; + } + } + if (e.usec_end) + trace_total_time = e.usec_end - trace_initial_time; + else + trace_total_time = e.usec_begin - trace_initial_time; +} + +function compute_scale() { + var outer = document.getElementById("outer"); + scale = Math.floor(trace_total_time / (outer.offsetWidth - (row_height * 2))); +}; + +function show_details(tid, i, event) { + var trace_events = trace_threads["e.tid"]; + var inner = trace_events[i].name + " " + + trace_events[i].duration / 1000 + "ms<br />" + + trace_events[i].id + "<br />" + + trace_events[i].extra + "<br />"; + var tooltip = document.getElementById("tooltip"); + tooltip.innerHTML = inner; + if (window.event) + event = window.event; + tooltip.style.top = event.pageY + 3; + tooltip.style.left = event.pageX + 3; + tooltip.style.display = "block"; +}; + +function generate_time_scale() { + var view_size = window.clientWidth; + var body_size = document.body.scrollWidth; + var inner = ""; + + var step_ms = Math.floor(scale / 10); // ms per 100px + var pow10 = Math.pow(10, Math.floor(Math.log(step_ms) / Math.log(10))); + var round = .5 * pow10; + step_ms = round * (Math.floor(step_ms / round)); // round to a multiple of round + for (var i = step_ms; i < trace_total_time / 1000; i += step_ms) { + var x = Math.floor(i * 1000 / scale); + inner += "<li class='time_tick' style='left: " + x + "px'>" + i + "</li>"; + } + var time_scale = document.getElementById("time_scale"); + time_scale.innerHTML = inner; + time_scale.style.width = document.body.scrollWidth; +} + +function generate_io_graph(trace_events, top) { + var max_height = 200; + var bucket_size = 50000; // millisecs + + var inner = ""; + var buckets = new Array(); + var value = 0; + var max_bucket = 0; + + // Go through events and find all read samples. + // Aggregate data into buckets. + for (var i in trace_events) { + var e = trace_events[i]; + if (e.name != "socket.read") { + continue; + } + + var bytes = parseInt(e.extra); +// bytes = 400; + + var start_time = e.usec_begin - trace_initial_time; + var mybucket = Math.floor(start_time / bucket_size); + + if (buckets[mybucket] == undefined) { + buckets[mybucket] = 0; + } + buckets[mybucket] += bytes; + + if (buckets[max_bucket] == undefined || + buckets[max_bucket] < buckets[mybucket]) { + max_bucket = mybucket; + } + } + + for (var index = 0; index < buckets.length; index++) { + var left = index * Math.floor(bucket_size / scale); + var width = Math.floor(bucket_size / scale); + if (width == 0) + width = 1; + + var height; + if (buckets[index] == undefined) { + height = 0; + } else { + height = (buckets[index] / buckets[max_bucket]) * max_height; + } + + var my_top = max_height - height; + + var style = "top: " + my_top + "px; left: " + left + "px; width: " + width + "px; height:" + height + "px;"; + var cls = "io"; + inner += "<li title='" + buckets[index] + " bytes' class='" + cls + "' id='li-" + i + "' style='" + style + "'></li>\n"; + } + + var subchart = document.createElement('div'); + subchart.setAttribute("class", "iograph"); + subchart.setAttribute("id", trace_events[0].tid); + subchart.innerHTML = inner; + subchart.style.height = max_height; + subchart.style.top = top; + subchart.style.left = 0; + subchart.style.position = "absolute"; +// subchart.style.width = row_height + last_max_x; + var chart = document.getElementById("chart"); + chart.appendChild(subchart); + + return top + max_height; +} + +function generate_subchart(trace_events, top) { + var start_top = top; + var heights = new Array(); + var max_row = 0; + var inner = ""; + var last_max_time = 0; + var last_max_x = 0; + for (var i in trace_events) { + var e = trace_events[i]; + var start_time = e.usec_begin - trace_initial_time; + var left = row_height + Math.floor(start_time / scale); + var width = Math.floor(e.duration / scale); + if (width == 0) + width = 1; + + if (heights[e.id]) { + top = heights[e.id]; + } else { + max_row += row_height; + heights[e.id] = max_row; + top = heights[e.id]; + } + //if (start_time < last_max_time) + // top += row_height; + var style = "top: " + top + "px; left: " + left + "px; width: " + width + "px;"; + var js = 'javascript:show_details("' + e.tid + '", ' + i + ', event);'; + var cls = e.name.split('.')[0]; + inner += "<li class='" + cls + "' onmouseover='" + js + "' id='li-" + i + "' style='" + style + "'></li>\n"; + last_max_time = start_time + e.duration; + last_max_x = left + width; + } + var subchart = document.createElement('div'); + subchart.setAttribute("class", "subchart"); + subchart.setAttribute("id", trace_events[0].tid); + subchart.innerHTML = inner; + subchart.style.top = start_top + "px"; + subchart.style.height = top + row_height; + subchart.style.width = row_height + last_max_x; + subchart.style.position = "absolute"; + var chart = document.getElementById("chart"); + chart.appendChild(subchart); + + return top; +}; + +function generate_chart() { + var chart = document.getElementById("chart"); + chart.innerHTML = ""; + var top = 60; + for (var t in trace_threads) { + top = generate_io_graph(trace_threads[t], top); + top = generate_subchart(trace_threads[t], top); + } + generate_time_scale(); +} + +function change_scale(event) { + if (!event) + event = window.event; + if (!event.shiftKey) + return; + var delta = 0; + if (event.wheelDelta) { + delta = event.wheelDelta / 120; + } else if (event.detail) { + delta = - event.detail / 3; + } + if (delta) { + var tooltip = document.getElementById("tooltip"); + tooltip.style.display = "none"; + var factor = 1.1; + if (delta < 0) + scale = Math.floor(scale * factor); + else + scale = Math.floor(scale / factor); + if (scale > 300000) + scale = 300000; + generate_chart(); + if (event.preventDefault) + event.preventDefault(); + } + event.returnValue = false; +}; + +function initial_load() { + if (window.addEventListener) + window.addEventListener('DOMMouseScroll', change_scale, false); + window.onmousewheel = document.onmousewheel = change_scale; + + process_raw_events(); + compute_scale(); + generate_chart(); +}; + +</script> +</head> +<body onload='initial_load();'> +<div id="header"> +<h2>Trace Events</h2> +<div id="instructions"> +Use shift+mouse-wheel to zoom in and out. +</div> +<div id="time_scale"></div> +</div> +<div id="legend"> +<span class="url"> </span> URL<br /> +<span class="http"> </span> HTTP<br /> +<span class="socket"> </span> Socket<br /> +<span class="v8"> </span> V8<br /> +<span class="loop"> </span> TASKS<br /> +</div> +<div id="chart"> +<div id="outer"> +</div> +</div> +<div id="tooltip" ondblclick="this.style.display = 'none';"></div> +</body> +</html> diff --git a/chrome/utility/importer/ie_importer_win.h b/chrome/utility/importer/ie_importer_win.h index 2e0752a..0283556 100644 --- a/chrome/utility/importer/ie_importer_win.h +++ b/chrome/utility/importer/ie_importer_win.h @@ -1,87 +1,87 @@ -// Copyright (c) 2012 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.
-
-#ifndef CHROME_UTILITY_IMPORTER_IE_IMPORTER_WIN_H_
-#define CHROME_UTILITY_IMPORTER_IE_IMPORTER_WIN_H_
-
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/files/file_path.h"
-#include "base/gtest_prod_util.h"
-#include "base/strings/string16.h"
-#include "chrome/utility/importer/importer.h"
-
-struct ImportedBookmarkEntry;
-struct ImportedFaviconUsage;
-
-class IEImporter : public Importer {
- public:
- IEImporter();
-
- // Importer:
- virtual void StartImport(const importer::SourceProfile& source_profile,
- uint16 items,
- ImporterBridge* bridge) OVERRIDE;
-
- private:
- typedef std::vector<ImportedBookmarkEntry> BookmarkVector;
-
- // A struct that hosts the information of IE Favorite folder.
- struct FavoritesInfo {
- base::FilePath path;
- base::string16 links_folder;
- };
-
- // IE PStore subkey GUID: AutoComplete password & form data.
- static const GUID kPStoreAutocompleteGUID;
-
- // A fake GUID for unit test.
- static const GUID kUnittestGUID;
-
- FRIEND_TEST_ALL_PREFIXES(ImporterTest, IEImporter);
-
- virtual ~IEImporter();
-
- void ImportFavorites();
-
- // Reads history information from COM interface.
- void ImportHistory();
-
- // Import password for IE6 stored in protected storage.
- void ImportPasswordsIE6();
-
- // Import password for IE7 and IE8 stored in Storage2.
- void ImportPasswordsIE7();
-
- void ImportSearchEngines();
-
- // Import the homepage setting of IE. Note: IE supports multiple home pages,
- // whereas Chrome doesn't, so we import only the one defined under the
- // 'Start Page' registry key. We don't import if the homepage is set to the
- // machine default.
- void ImportHomepage();
-
- // Gets the information of Favorites folder. Returns true if successful.
- bool GetFavoritesInfo(FavoritesInfo* info);
-
- // This function will read the files in the Favorites folder, and store
- // the bookmark items in |bookmarks| and favicon information in |favicons|.
- void ParseFavoritesFolder(
- const FavoritesInfo& info,
- BookmarkVector* bookmarks,
- std::vector<ImportedFaviconUsage>* favicons);
-
- // Determines which version of IE is in use.
- int CurrentIEVersion() const;
-
- // IE does not have source path. It's used in unit tests only for providing a
- // fake source.
- base::FilePath source_path_;
-
- DISALLOW_COPY_AND_ASSIGN(IEImporter);
-};
-
-#endif // CHROME_UTILITY_IMPORTER_IE_IMPORTER_WIN_H_
+// Copyright (c) 2012 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. + +#ifndef CHROME_UTILITY_IMPORTER_IE_IMPORTER_WIN_H_ +#define CHROME_UTILITY_IMPORTER_IE_IMPORTER_WIN_H_ + +#include <vector> + +#include "base/basictypes.h" +#include "base/compiler_specific.h" +#include "base/files/file_path.h" +#include "base/gtest_prod_util.h" +#include "base/strings/string16.h" +#include "chrome/utility/importer/importer.h" + +struct ImportedBookmarkEntry; +struct ImportedFaviconUsage; + +class IEImporter : public Importer { + public: + IEImporter(); + + // Importer: + virtual void StartImport(const importer::SourceProfile& source_profile, + uint16 items, + ImporterBridge* bridge) OVERRIDE; + + private: + typedef std::vector<ImportedBookmarkEntry> BookmarkVector; + + // A struct that hosts the information of IE Favorite folder. + struct FavoritesInfo { + base::FilePath path; + base::string16 links_folder; + }; + + // IE PStore subkey GUID: AutoComplete password & form data. + static const GUID kPStoreAutocompleteGUID; + + // A fake GUID for unit test. + static const GUID kUnittestGUID; + + FRIEND_TEST_ALL_PREFIXES(ImporterTest, IEImporter); + + virtual ~IEImporter(); + + void ImportFavorites(); + + // Reads history information from COM interface. + void ImportHistory(); + + // Import password for IE6 stored in protected storage. + void ImportPasswordsIE6(); + + // Import password for IE7 and IE8 stored in Storage2. + void ImportPasswordsIE7(); + + void ImportSearchEngines(); + + // Import the homepage setting of IE. Note: IE supports multiple home pages, + // whereas Chrome doesn't, so we import only the one defined under the + // 'Start Page' registry key. We don't import if the homepage is set to the + // machine default. + void ImportHomepage(); + + // Gets the information of Favorites folder. Returns true if successful. + bool GetFavoritesInfo(FavoritesInfo* info); + + // This function will read the files in the Favorites folder, and store + // the bookmark items in |bookmarks| and favicon information in |favicons|. + void ParseFavoritesFolder( + const FavoritesInfo& info, + BookmarkVector* bookmarks, + std::vector<ImportedFaviconUsage>* favicons); + + // Determines which version of IE is in use. + int CurrentIEVersion() const; + + // IE does not have source path. It's used in unit tests only for providing a + // fake source. + base::FilePath source_path_; + + DISALLOW_COPY_AND_ASSIGN(IEImporter); +}; + +#endif // CHROME_UTILITY_IMPORTER_IE_IMPORTER_WIN_H_ diff --git a/components/google/OWNERS b/components/google/OWNERS index 313ac5f..2c1c5e2 100644 --- a/components/google/OWNERS +++ b/components/google/OWNERS @@ -1,2 +1,2 @@ -isherman@chromium.org
+isherman@chromium.org pkasting@chromium.org
\ No newline at end of file diff --git a/content/child/webcrypto/OWNERS b/content/child/webcrypto/OWNERS index a1853a1..6b60858 100644 --- a/content/child/webcrypto/OWNERS +++ b/content/child/webcrypto/OWNERS @@ -1,2 +1,2 @@ -eroman@chromium.org
-rsleevi@chromium.org
+eroman@chromium.org +rsleevi@chromium.org diff --git a/courgette/third_party/README.chromium b/courgette/third_party/README.chromium index d3037a1..b3b28bd 100644 --- a/courgette/third_party/README.chromium +++ b/courgette/third_party/README.chromium @@ -1,23 +1,23 @@ -This directory contains an extensively modified version of Colin Percival's
-bsdiff, available in its original form from:
-
- http://www.daemonology.net/bsdiff/
-
-The basic principles of operation are best understood by reading Colin's
-unpublised paper:
-
-Colin Percival, Naive differences of executable code, http://www.daemonology.net/bsdiff/, 200
-
-The copy on this directory so extensively modified that the binary format is
-incompatible with the original and it cannot be compiled outside the Chromium
-source tree or the Courgette project.
-
-List of changes made to original code:
- - wrapped functions in 'courgette' namespace
- - renamed .c files to .cc
- - added bsdiff.h header file
- - changed the code to use streams.h from courgette
- - changed the encoding of numbers to use the 'varint' encoding
- - reformatted code to be closer to Google coding standards
- - renamed variables
- - added comments
+This directory contains an extensively modified version of Colin Percival's +bsdiff, available in its original form from: + + http://www.daemonology.net/bsdiff/ + +The basic principles of operation are best understood by reading Colin's +unpublised paper: + +Colin Percival, Naive differences of executable code, http://www.daemonology.net/bsdiff/, 200 + +The copy on this directory so extensively modified that the binary format is +incompatible with the original and it cannot be compiled outside the Chromium +source tree or the Courgette project. + +List of changes made to original code: + - wrapped functions in 'courgette' namespace + - renamed .c files to .cc + - added bsdiff.h header file + - changed the code to use streams.h from courgette + - changed the encoding of numbers to use the 'varint' encoding + - reformatted code to be closer to Google coding standards + - renamed variables + - added comments diff --git a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.cc b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.cc index 5ed8a1d..b324727 100644 --- a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.cc +++ b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.cc @@ -1,107 +1,107 @@ -// Copyright 2014 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.
-
-#include "google_apis/gcm/monitoring/fake_gcm_stats_recorder.h"
-
-namespace gcm {
-
-FakeGCMStatsRecorder::FakeGCMStatsRecorder() {
-}
-
-FakeGCMStatsRecorder::~FakeGCMStatsRecorder() {
-}
-
-void FakeGCMStatsRecorder::RecordCheckinInitiated(uint64 android_id) {
-}
-
-void FakeGCMStatsRecorder::RecordCheckinDelayedDueToBackoff(int64 delay_msec) {
-}
-
-void FakeGCMStatsRecorder::RecordCheckinSuccess() {
-}
-
-void FakeGCMStatsRecorder::RecordCheckinFailure(std::string status,
- bool will_retry) {
-}
-
-void FakeGCMStatsRecorder::RecordConnectionInitiated(const std::string& host) {
-}
-
-void FakeGCMStatsRecorder::RecordConnectionDelayedDueToBackoff(
- int64 delay_msec) {
-}
-
-void FakeGCMStatsRecorder::RecordConnectionSuccess() {
-}
-
-void FakeGCMStatsRecorder::RecordConnectionFailure(int network_error) {
-}
-
-void FakeGCMStatsRecorder::RecordConnectionResetSignaled(
- ConnectionFactory::ConnectionResetReason reason) {
-}
-
-void FakeGCMStatsRecorder::RecordRegistrationSent(
- const std::string& app_id,
- const std::string& sender_ids) {
-}
-
-void FakeGCMStatsRecorder::RecordRegistrationResponse(
- const std::string& app_id,
- const std::vector<std::string>& sender_ids,
- RegistrationRequest::Status status) {
-}
-
-void FakeGCMStatsRecorder::RecordRegistrationRetryRequested(
- const std::string& app_id,
- const std::vector<std::string>& sender_ids,
- int retries_left) {
-}
-
-void FakeGCMStatsRecorder::RecordUnregistrationSent(
- const std::string& app_id) {
-}
-
-void FakeGCMStatsRecorder::RecordUnregistrationResponse(
- const std::string& app_id,
- UnregistrationRequest::Status status) {
-}
-
-void FakeGCMStatsRecorder::RecordUnregistrationRetryDelayed(
- const std::string& app_id,
- int64 delay_msec) {
-}
-
-void FakeGCMStatsRecorder::RecordDataMessageReceived(
- const std::string& app_id,
- const std::string& from,
- int message_byte_size,
- bool to_registered_app,
- ReceivedMessageType message_type) {
-}
-
-void FakeGCMStatsRecorder::RecordDataSentToWire(
- const std::string& app_id,
- const std::string& receiver_id,
- const std::string& message_id,
- int queued) {
-}
-
-void FakeGCMStatsRecorder::RecordNotifySendStatus(
- const std::string& app_id,
- const std::string& receiver_id,
- const std::string& message_id,
- gcm::MCSClient::MessageSendStatus status,
- int byte_size,
- int ttl) {
-}
-
-void FakeGCMStatsRecorder::RecordIncomingSendError(
- const std::string& app_id,
- const std::string& receiver_id,
- const std::string& message_id) {
-}
-
-
-} // namespace gcm
+// Copyright 2014 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. + +#include "google_apis/gcm/monitoring/fake_gcm_stats_recorder.h" + +namespace gcm { + +FakeGCMStatsRecorder::FakeGCMStatsRecorder() { +} + +FakeGCMStatsRecorder::~FakeGCMStatsRecorder() { +} + +void FakeGCMStatsRecorder::RecordCheckinInitiated(uint64 android_id) { +} + +void FakeGCMStatsRecorder::RecordCheckinDelayedDueToBackoff(int64 delay_msec) { +} + +void FakeGCMStatsRecorder::RecordCheckinSuccess() { +} + +void FakeGCMStatsRecorder::RecordCheckinFailure(std::string status, + bool will_retry) { +} + +void FakeGCMStatsRecorder::RecordConnectionInitiated(const std::string& host) { +} + +void FakeGCMStatsRecorder::RecordConnectionDelayedDueToBackoff( + int64 delay_msec) { +} + +void FakeGCMStatsRecorder::RecordConnectionSuccess() { +} + +void FakeGCMStatsRecorder::RecordConnectionFailure(int network_error) { +} + +void FakeGCMStatsRecorder::RecordConnectionResetSignaled( + ConnectionFactory::ConnectionResetReason reason) { +} + +void FakeGCMStatsRecorder::RecordRegistrationSent( + const std::string& app_id, + const std::string& sender_ids) { +} + +void FakeGCMStatsRecorder::RecordRegistrationResponse( + const std::string& app_id, + const std::vector<std::string>& sender_ids, + RegistrationRequest::Status status) { +} + +void FakeGCMStatsRecorder::RecordRegistrationRetryRequested( + const std::string& app_id, + const std::vector<std::string>& sender_ids, + int retries_left) { +} + +void FakeGCMStatsRecorder::RecordUnregistrationSent( + const std::string& app_id) { +} + +void FakeGCMStatsRecorder::RecordUnregistrationResponse( + const std::string& app_id, + UnregistrationRequest::Status status) { +} + +void FakeGCMStatsRecorder::RecordUnregistrationRetryDelayed( + const std::string& app_id, + int64 delay_msec) { +} + +void FakeGCMStatsRecorder::RecordDataMessageReceived( + const std::string& app_id, + const std::string& from, + int message_byte_size, + bool to_registered_app, + ReceivedMessageType message_type) { +} + +void FakeGCMStatsRecorder::RecordDataSentToWire( + const std::string& app_id, + const std::string& receiver_id, + const std::string& message_id, + int queued) { +} + +void FakeGCMStatsRecorder::RecordNotifySendStatus( + const std::string& app_id, + const std::string& receiver_id, + const std::string& message_id, + gcm::MCSClient::MessageSendStatus status, + int byte_size, + int ttl) { +} + +void FakeGCMStatsRecorder::RecordIncomingSendError( + const std::string& app_id, + const std::string& receiver_id, + const std::string& message_id) { +} + + +} // namespace gcm diff --git a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h index 1ada611..95d9aa2 100644 --- a/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h +++ b/google_apis/gcm/monitoring/fake_gcm_stats_recorder.h @@ -1,71 +1,71 @@ -// Copyright 2014 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.
-
-#ifndef GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_
-#define GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_
-
-#include "google_apis/gcm/monitoring/gcm_stats_recorder.h"
-
-namespace gcm {
-
-// The fake version of GCMStatsRecorder that does nothing.
-class FakeGCMStatsRecorder : public GCMStatsRecorder {
- public:
- FakeGCMStatsRecorder();
- virtual ~FakeGCMStatsRecorder();
-
- virtual void RecordCheckinInitiated(uint64 android_id) OVERRIDE;
- virtual void RecordCheckinDelayedDueToBackoff(int64 delay_msec) OVERRIDE;
- virtual void RecordCheckinSuccess() OVERRIDE;
- virtual void RecordCheckinFailure(std::string status,
- bool will_retry) OVERRIDE;
- virtual void RecordConnectionInitiated(const std::string& host) OVERRIDE;
- virtual void RecordConnectionDelayedDueToBackoff(int64 delay_msec) OVERRIDE;
- virtual void RecordConnectionSuccess() OVERRIDE;
- virtual void RecordConnectionFailure(int network_error) OVERRIDE;
- virtual void RecordConnectionResetSignaled(
- ConnectionFactory::ConnectionResetReason reason) OVERRIDE;
- virtual void RecordRegistrationSent(const std::string& app_id,
- const std::string& sender_ids) OVERRIDE;
- virtual void RecordRegistrationResponse(
- const std::string& app_id,
- const std::vector<std::string>& sender_ids,
- RegistrationRequest::Status status) OVERRIDE;
- virtual void RecordRegistrationRetryRequested(
- const std::string& app_id,
- const std::vector<std::string>& sender_ids,
- int retries_left) OVERRIDE;
- virtual void RecordUnregistrationSent(const std::string& app_id) OVERRIDE;
- virtual void RecordUnregistrationResponse(
- const std::string& app_id,
- UnregistrationRequest::Status status) OVERRIDE;
- virtual void RecordUnregistrationRetryDelayed(const std::string& app_id,
- int64 delay_msec) OVERRIDE;
- virtual void RecordDataMessageReceived(
- const std::string& app_id,
- const std::string& from,
- int message_byte_size,
- bool to_registered_app,
- ReceivedMessageType message_type) OVERRIDE;
- virtual void RecordDataSentToWire(const std::string& app_id,
- const std::string& receiver_id,
- const std::string& message_id,
- int queued) OVERRIDE;
- virtual void RecordNotifySendStatus(const std::string& app_id,
- const std::string& receiver_id,
- const std::string& message_id,
- MCSClient::MessageSendStatus status,
- int byte_size,
- int ttl) OVERRIDE;
- virtual void RecordIncomingSendError(const std::string& app_id,
- const std::string& receiver_id,
- const std::string& message_id) OVERRIDE;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FakeGCMStatsRecorder);
-};
-
-} // namespace gcm
-
-#endif // GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_
+// Copyright 2014 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. + +#ifndef GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_ +#define GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_ + +#include "google_apis/gcm/monitoring/gcm_stats_recorder.h" + +namespace gcm { + +// The fake version of GCMStatsRecorder that does nothing. +class FakeGCMStatsRecorder : public GCMStatsRecorder { + public: + FakeGCMStatsRecorder(); + virtual ~FakeGCMStatsRecorder(); + + virtual void RecordCheckinInitiated(uint64 android_id) OVERRIDE; + virtual void RecordCheckinDelayedDueToBackoff(int64 delay_msec) OVERRIDE; + virtual void RecordCheckinSuccess() OVERRIDE; + virtual void RecordCheckinFailure(std::string status, + bool will_retry) OVERRIDE; + virtual void RecordConnectionInitiated(const std::string& host) OVERRIDE; + virtual void RecordConnectionDelayedDueToBackoff(int64 delay_msec) OVERRIDE; + virtual void RecordConnectionSuccess() OVERRIDE; + virtual void RecordConnectionFailure(int network_error) OVERRIDE; + virtual void RecordConnectionResetSignaled( + ConnectionFactory::ConnectionResetReason reason) OVERRIDE; + virtual void RecordRegistrationSent(const std::string& app_id, + const std::string& sender_ids) OVERRIDE; + virtual void RecordRegistrationResponse( + const std::string& app_id, + const std::vector<std::string>& sender_ids, + RegistrationRequest::Status status) OVERRIDE; + virtual void RecordRegistrationRetryRequested( + const std::string& app_id, + const std::vector<std::string>& sender_ids, + int retries_left) OVERRIDE; + virtual void RecordUnregistrationSent(const std::string& app_id) OVERRIDE; + virtual void RecordUnregistrationResponse( + const std::string& app_id, + UnregistrationRequest::Status status) OVERRIDE; + virtual void RecordUnregistrationRetryDelayed(const std::string& app_id, + int64 delay_msec) OVERRIDE; + virtual void RecordDataMessageReceived( + const std::string& app_id, + const std::string& from, + int message_byte_size, + bool to_registered_app, + ReceivedMessageType message_type) OVERRIDE; + virtual void RecordDataSentToWire(const std::string& app_id, + const std::string& receiver_id, + const std::string& message_id, + int queued) OVERRIDE; + virtual void RecordNotifySendStatus(const std::string& app_id, + const std::string& receiver_id, + const std::string& message_id, + MCSClient::MessageSendStatus status, + int byte_size, + int ttl) OVERRIDE; + virtual void RecordIncomingSendError(const std::string& app_id, + const std::string& receiver_id, + const std::string& message_id) OVERRIDE; + + private: + DISALLOW_COPY_AND_ASSIGN(FakeGCMStatsRecorder); +}; + +} // namespace gcm + +#endif // GOOGLE_APIS_GCM_MONITORING_FAKE_GCM_STATS_RECODER_H_ diff --git a/net/test/net_test_suite.cc b/net/test/net_test_suite.cc index 2d13877..175cec29 100644 --- a/net/test/net_test_suite.cc +++ b/net/test/net_test_suite.cc @@ -1,67 +1,67 @@ -// Copyright (c) 2012 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.
-
-#include "net/test/net_test_suite.h"
-
-#include "base/message_loop/message_loop.h"
-#include "net/base/network_change_notifier.h"
-#include "net/http/http_stream_factory.h"
-#include "net/spdy/spdy_session.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(USE_NSS) || defined(OS_IOS)
-#include "net/ocsp/nss_ocsp.h"
-#endif
-
-class StaticReset : public ::testing::EmptyTestEventListener {
- virtual void OnTestStart(const ::testing::TestInfo& test_info) OVERRIDE {
- net::HttpStreamFactory::ResetStaticSettingsToInit();
- }
-};
-
-NetTestSuite::NetTestSuite(int argc, char** argv)
- : TestSuite(argc, argv) {
-}
-
-NetTestSuite::NetTestSuite(int argc, char** argv,
- bool create_at_exit_manager)
- : TestSuite(argc, argv, create_at_exit_manager) {
-}
-
-NetTestSuite::~NetTestSuite() {}
-
-void NetTestSuite::Initialize() {
- TestSuite::Initialize();
- ::testing::UnitTest::GetInstance()->listeners().Append(new StaticReset());
- InitializeTestThread();
-}
-
-void NetTestSuite::Shutdown() {
-#if defined(USE_NSS) || defined(OS_IOS)
- net::ShutdownNSSHttpIO();
-#endif
-
- // We want to destroy this here before the TestSuite continues to tear down
- // the environment.
- message_loop_.reset();
-
- TestSuite::Shutdown();
-}
-
-void NetTestSuite::InitializeTestThread() {
- network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock());
-
- InitializeTestThreadNoNetworkChangeNotifier();
-}
-
-void NetTestSuite::InitializeTestThreadNoNetworkChangeNotifier() {
- host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL);
- scoped_host_resolver_proc_.Init(host_resolver_proc_.get());
- // In case any attempts are made to resolve host names, force them all to
- // be mapped to localhost. This prevents DNS queries from being sent in
- // the process of running these unit tests.
- host_resolver_proc_->AddRule("*", "127.0.0.1");
-
- message_loop_.reset(new base::MessageLoopForIO());
-}
+// Copyright (c) 2012 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. + +#include "net/test/net_test_suite.h" + +#include "base/message_loop/message_loop.h" +#include "net/base/network_change_notifier.h" +#include "net/http/http_stream_factory.h" +#include "net/spdy/spdy_session.h" +#include "testing/gtest/include/gtest/gtest.h" + +#if defined(USE_NSS) || defined(OS_IOS) +#include "net/ocsp/nss_ocsp.h" +#endif + +class StaticReset : public ::testing::EmptyTestEventListener { + virtual void OnTestStart(const ::testing::TestInfo& test_info) OVERRIDE { + net::HttpStreamFactory::ResetStaticSettingsToInit(); + } +}; + +NetTestSuite::NetTestSuite(int argc, char** argv) + : TestSuite(argc, argv) { +} + +NetTestSuite::NetTestSuite(int argc, char** argv, + bool create_at_exit_manager) + : TestSuite(argc, argv, create_at_exit_manager) { +} + +NetTestSuite::~NetTestSuite() {} + +void NetTestSuite::Initialize() { + TestSuite::Initialize(); + ::testing::UnitTest::GetInstance()->listeners().Append(new StaticReset()); + InitializeTestThread(); +} + +void NetTestSuite::Shutdown() { +#if defined(USE_NSS) || defined(OS_IOS) + net::ShutdownNSSHttpIO(); +#endif + + // We want to destroy this here before the TestSuite continues to tear down + // the environment. + message_loop_.reset(); + + TestSuite::Shutdown(); +} + +void NetTestSuite::InitializeTestThread() { + network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock()); + + InitializeTestThreadNoNetworkChangeNotifier(); +} + +void NetTestSuite::InitializeTestThreadNoNetworkChangeNotifier() { + host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL); + scoped_host_resolver_proc_.Init(host_resolver_proc_.get()); + // In case any attempts are made to resolve host names, force them all to + // be mapped to localhost. This prevents DNS queries from being sent in + // the process of running these unit tests. + host_resolver_proc_->AddRule("*", "127.0.0.1"); + + message_loop_.reset(new base::MessageLoopForIO()); +} diff --git a/third_party/modp_b64/OWNERS b/third_party/modp_b64/OWNERS index fcfec1d..0144bac 100644 --- a/third_party/modp_b64/OWNERS +++ b/third_party/modp_b64/OWNERS @@ -1,2 +1,2 @@ -jschuh@chromium.org
-rsleevi@chromium.org
+jschuh@chromium.org +rsleevi@chromium.org diff --git a/tools/sheriffing/app.yaml b/tools/sheriffing/app.yaml index 886bd11..4c7c965 100644 --- a/tools/sheriffing/app.yaml +++ b/tools/sheriffing/app.yaml @@ -1,17 +1,17 @@ -application: chromium-sheriffing
-version: 1
-runtime: python27
-api_version: 1
-threadsafe: true
-
-# Silly way of using appspot for static hosting. (It has a "free" tier vs.
-# Cloud Storage which requires billing info for the << $1 it will cost to
-# host this.)
-handlers:
-- url: /
- static_files: index.html
- upload: index.html
-
-- url: /(.*)
- static_files: \1
- upload: (.*)
+application: chromium-sheriffing +version: 1 +runtime: python27 +api_version: 1 +threadsafe: true + +# Silly way of using appspot for static hosting. (It has a "free" tier vs. +# Cloud Storage which requires billing info for the << $1 it will cost to +# host this.) +handlers: +- url: / + static_files: index.html + upload: index.html + +- url: /(.*) + static_files: \1 + upload: (.*) diff --git a/ui/README.chromium b/ui/README.chromium index 1824944..b134653 100644 --- a/ui/README.chromium +++ b/ui/README.chromium @@ -1,6 +1,6 @@ -This directory contains discrete components used to build Chromium's user
-interface.
-
-Each subdirectory must be an isolated component that lists its dependencies in
-a DEPS file. See subdirectory README.chromium files for specific information
-about each component.
+This directory contains discrete components used to build Chromium's user +interface. + +Each subdirectory must be an isolated component that lists its dependencies in +a DEPS file. See subdirectory README.chromium files for specific information +about each component. diff --git a/ui/v2/OWNERS b/ui/v2/OWNERS index f2f5774..9c070a5 100644 --- a/ui/v2/OWNERS +++ b/ui/v2/OWNERS @@ -1 +1 @@ -ben@chromium.org
+ben@chromium.org diff --git a/ui/views/OWNERS b/ui/views/OWNERS index 8e95571..bcc5cf9 100644 --- a/ui/views/OWNERS +++ b/ui/views/OWNERS @@ -1,3 +1,3 @@ -ben@chromium.org
-sadrul@chromium.org
-sky@chromium.org
+ben@chromium.org +sadrul@chromium.org +sky@chromium.org diff --git a/ui/views/corewm/README.chromium b/ui/views/corewm/README.chromium index a5513c4..cfb2b6a 100644 --- a/ui/views/corewm/README.chromium +++ b/ui/views/corewm/README.chromium @@ -1,2 +1,2 @@ -This directory contains window-manager code that is shared by Ash and the
-Desktop Aura implementation.
+This directory contains window-manager code that is shared by Ash and the +Desktop Aura implementation. diff --git a/ui/views/widget/desktop_aura/README.chromium b/ui/views/widget/desktop_aura/README.chromium index 5e0ff71..a81055f 100644 --- a/ui/views/widget/desktop_aura/README.chromium +++ b/ui/views/widget/desktop_aura/README.chromium @@ -1,2 +1,2 @@ -This directory contains the views::NativeWidget implementation used for the
-Desktop Aura port, and required supporting infrastructure.
+This directory contains the views::NativeWidget implementation used for the +Desktop Aura port, and required supporting infrastructure. diff --git a/win8/metro_driver/DEPS b/win8/metro_driver/DEPS index 62079c3..c767809 100644 --- a/win8/metro_driver/DEPS +++ b/win8/metro_driver/DEPS @@ -1,5 +1,5 @@ -include_rules = [
- # Allow metro_driver to include from delegate_execute *temporarily*.
- # TODO(ananta): Remove this by fixing toast_notification_handler.cc.
- "+win8/delegate_execute",
+include_rules = [ + # Allow metro_driver to include from delegate_execute *temporarily*. + # TODO(ananta): Remove this by fixing toast_notification_handler.cc. + "+win8/delegate_execute", ]
\ No newline at end of file |