From d42a8f8372389ff80a2f0f55b8826318a6ed2c93 Mon Sep 17 00:00:00 2001 From: Daniel Cheng Date: Mon, 6 Oct 2014 20:22:19 -0700 Subject: 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} --- .../browser/extensions/extension_message_bubble.h | 68 +- chrome/browser/google/OWNERS | 2 +- .../profiles/file_path_verifier_win_unittest.cc | 80 +-- chrome/browser/resources/extensions_infobar.css | 24 +- chrome/browser/resources/net_internals/OWNERS | 4 +- chrome/browser/services/gcm/gcm_app_handler.h | 24 +- chrome/browser/ui/ash/OWNERS | 8 +- chrome/browser/ui/omnibox/OWNERS | 4 +- chrome/browser/ui/search_engines/OWNERS | 4 +- chrome/browser/ui/views/ash/OWNERS | 6 +- chrome/browser/ui/webui/net_internals/OWNERS | 4 +- chrome/browser/web_applications/OWNERS | 2 +- chrome/installer/setup/eula/oem.css | 102 +-- chrome/tools/tracing/trace.html | 790 ++++++++++----------- chrome/utility/importer/ie_importer_win.h | 174 ++--- 15 files changed, 648 insertions(+), 648 deletions(-) (limited to 'chrome') 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 @@ - - - - - -Trace Events - - - - - - - - -
-  URL
-  HTTP
-  Socket
-  V8
-  TASKS
-
-
-
-
-
-
- - + + + + + +Trace Events + + + + + + + + +
+  URL
+  HTTP
+  Socket
+  V8
+  TASKS
+
+
+
+
+
+
+ + 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 - -#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 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* 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 + +#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 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* 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_ -- cgit v1.1