Skip to content

Commit

Permalink
Rewrite line endings from CRLF to LF for a bunch of files.
Browse files Browse the repository at this point in the history
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}
  • Loading branch information
zetafunction committed Oct 7, 2014
1 parent d974ccd commit d42a8f8
Show file tree
Hide file tree
Showing 29 changed files with 956 additions and 956 deletions.
68 changes: 34 additions & 34 deletions chrome/browser/extensions/extension_message_bubble.h
Original file line number Diff line number Diff line change
@@ -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_
2 changes: 1 addition & 1 deletion chrome/browser/google/OWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
isherman@chromium.org
isherman@chromium.org
pkasting@chromium.org
80 changes: 40 additions & 40 deletions chrome/browser/profiles/file_path_verifier_win_unittest.cc
Original file line number Diff line number Diff line change
@@ -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();
}
}
24 changes: 12 additions & 12 deletions chrome/browser/resources/extensions_infobar.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
4 changes: 2 additions & 2 deletions chrome/browser/resources/net_internals/OWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
eroman@chromium.org
mmenke@chromium.org
eroman@chromium.org
mmenke@chromium.org
24 changes: 12 additions & 12 deletions chrome/browser/services/gcm/gcm_app_handler.h
Original file line number Diff line number Diff line change
@@ -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_
8 changes: 4 additions & 4 deletions chrome/browser/ui/ash/OWNERS
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions chrome/browser/ui/omnibox/OWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pkasting@chromium.org
sky@chromium.org
pkasting@chromium.org
sky@chromium.org
4 changes: 2 additions & 2 deletions chrome/browser/ui/search_engines/OWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pkasting@chromium.org
sky@chromium.org
pkasting@chromium.org
sky@chromium.org
6 changes: 3 additions & 3 deletions chrome/browser/ui/views/ash/OWNERS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
derat@chromium.org
jamescook@chromium.org
sky@chromium.org
derat@chromium.org
jamescook@chromium.org
sky@chromium.org
4 changes: 2 additions & 2 deletions chrome/browser/ui/webui/net_internals/OWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
eroman@chromium.org
mmenke@chromium.org
eroman@chromium.org
mmenke@chromium.org
2 changes: 1 addition & 1 deletion chrome/browser/web_applications/OWNERS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
benwells@chromium.org
benwells@chromium.org
tapted@chromium.org

# Windows
Expand Down
102 changes: 51 additions & 51 deletions chrome/installer/setup/eula/oem.css
Original file line number Diff line number Diff line change
@@ -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;
}
Loading

0 comments on commit d42a8f8

Please sign in to comment.