Fix some line endings in browser/dom_ui.

Review URL: http://codereview.chromium.org/57028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12818 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 115 insertions, 115 deletions

diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.cc b/chrome/browser/dom_ui/dom_ui_favicon_source.cc
index 985ded4..d9ba79e 100644
--- a/chrome/browser/dom_ui/dom_ui_favicon_source.cc
+++ b/chrome/browser/dom_ui/dom_ui_favicon_source.cc
@@ -1,63 +1,63 @@
-// Copyright (c) 2009 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/dom_ui/dom_ui_favicon_source.h"

-

-#include "chrome/browser/profile.h"

-#include "chrome/common/resource_bundle.h"

-#include "chrome/common/url_constants.h"

+// Copyright (c) 2009 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/dom_ui/dom_ui_favicon_source.h"
+
+#include "chrome/browser/profile.h"
+#include "chrome/common/resource_bundle.h"
+#include "chrome/common/url_constants.h"
 #include "grit/theme_resources.h"
-

-DOMUIFavIconSource::DOMUIFavIconSource(Profile* profile)

-    : DataSource(chrome::kChromeUIFavIconPath, MessageLoop::current()),

-      profile_(profile) {

-}

-

-void DOMUIFavIconSource::StartDataRequest(const std::string& path,

-                                          int request_id) {

-  HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);

-  if (hs) {

-    HistoryService::Handle handle;

-    if (path.size() > 8 && path.substr(0, 8) == "iconurl/") {

-      handle = hs->GetFavIcon(

-          GURL(path.substr(8)),

-          &cancelable_consumer_,

-          NewCallback(this, &DOMUIFavIconSource::OnFavIconDataAvailable));

-    } else {

-      handle = hs->GetFavIconForURL(

-          GURL(path),

-          &cancelable_consumer_,

-          NewCallback(this, &DOMUIFavIconSource::OnFavIconDataAvailable));

-    }

-    // Attach the ChromeURLDataManager request ID to the history request.

-    cancelable_consumer_.SetClientData(hs, handle, request_id);

-  } else {

-    SendResponse(request_id, NULL);

-  }

-}

-

-void DOMUIFavIconSource::OnFavIconDataAvailable(

-    HistoryService::Handle request_handle,

-    bool know_favicon,

-    scoped_refptr<RefCountedBytes> data,

-    bool expired,

-    GURL icon_url) {

-  HistoryService* hs =

-      profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);

-  int request_id = cancelable_consumer_.GetClientData(hs, request_handle);

-

-  if (know_favicon && data.get() && !data->data.empty()) {

-    // Forward the data along to the networking system.

-    SendResponse(request_id, data);

-  } else {

-    if (!default_favicon_.get()) {

-      default_favicon_ = new RefCountedBytes;

-      ResourceBundle::GetSharedInstance().LoadImageResourceBytes(

-          IDR_DEFAULT_FAVICON, &default_favicon_->data);

-    }

-

-    SendResponse(request_id, default_favicon_);

-  }

-}

-

+
+DOMUIFavIconSource::DOMUIFavIconSource(Profile* profile)
+    : DataSource(chrome::kChromeUIFavIconPath, MessageLoop::current()),
+      profile_(profile) {
+}
+
+void DOMUIFavIconSource::StartDataRequest(const std::string& path,
+                                          int request_id) {
+  HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  if (hs) {
+    HistoryService::Handle handle;
+    if (path.size() > 8 && path.substr(0, 8) == "iconurl/") {
+      handle = hs->GetFavIcon(
+          GURL(path.substr(8)),
+          &cancelable_consumer_,
+          NewCallback(this, &DOMUIFavIconSource::OnFavIconDataAvailable));
+    } else {
+      handle = hs->GetFavIconForURL(
+          GURL(path),
+          &cancelable_consumer_,
+          NewCallback(this, &DOMUIFavIconSource::OnFavIconDataAvailable));
+    }
+    // Attach the ChromeURLDataManager request ID to the history request.
+    cancelable_consumer_.SetClientData(hs, handle, request_id);
+  } else {
+    SendResponse(request_id, NULL);
+  }
+}
+
+void DOMUIFavIconSource::OnFavIconDataAvailable(
+    HistoryService::Handle request_handle,
+    bool know_favicon,
+    scoped_refptr<RefCountedBytes> data,
+    bool expired,
+    GURL icon_url) {
+  HistoryService* hs =
+      profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  int request_id = cancelable_consumer_.GetClientData(hs, request_handle);
+
+  if (know_favicon && data.get() && !data->data.empty()) {
+    // Forward the data along to the networking system.
+    SendResponse(request_id, data);
+  } else {
+    if (!default_favicon_.get()) {
+      default_favicon_ = new RefCountedBytes;
+      ResourceBundle::GetSharedInstance().LoadImageResourceBytes(
+          IDR_DEFAULT_FAVICON, &default_favicon_->data);
+    }
+
+    SendResponse(request_id, default_favicon_);
+  }
+}
+
diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
index 5f1724e3..45b4bf3 100644
--- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
+++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
@@ -1,53 +1,53 @@
-// Copyright (c) 2009 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/dom_ui/dom_ui_thumbnail_source.h"

-

-#include "chrome/browser/profile.h"

-#include "chrome/common/resource_bundle.h"

-#include "chrome/common/url_constants.h"

-#include "googleurl/src/gurl.h"

-#include "grit/theme_resources.h"

-

-DOMUIThumbnailSource::DOMUIThumbnailSource(Profile* profile)

-    : DataSource(chrome::kChromeUIThumbnailPath, MessageLoop::current()),

-      profile_(profile) {

-}

-

-void DOMUIThumbnailSource::StartDataRequest(const std::string& path,

-                                            int request_id) {

-  HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);

-  if (hs) {

-    HistoryService::Handle handle = hs->GetPageThumbnail(

-        GURL(path),

-        &cancelable_consumer_,

-        NewCallback(this, &DOMUIThumbnailSource::OnThumbnailDataAvailable));

-    // Attach the ChromeURLDataManager request ID to the history request.

-    cancelable_consumer_.SetClientData(hs, handle, request_id);

-  } else {

-    // Tell the caller that no thumbnail is available.

-    SendResponse(request_id, NULL);

-  }

-}

-

-void DOMUIThumbnailSource::OnThumbnailDataAvailable(

-    HistoryService::Handle request_handle,

-    scoped_refptr<RefCountedBytes> data) {

-  HistoryService* hs =

-      profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);

-  int request_id = cancelable_consumer_.GetClientData(hs, request_handle);

-  // Forward the data along to the networking system.

-  if (data.get() && !data->data.empty()) {

-    SendResponse(request_id, data);

-  } else {

-    if (!default_thumbnail_.get()) {

-      default_thumbnail_ = new RefCountedBytes;

-      ResourceBundle::GetSharedInstance().LoadImageResourceBytes(

-          IDR_DEFAULT_THUMBNAIL, &default_thumbnail_->data);

-    }

-

-    SendResponse(request_id, default_thumbnail_);

-  }

-}

-

+// Copyright (c) 2009 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/dom_ui/dom_ui_thumbnail_source.h"
+
+#include "chrome/browser/profile.h"
+#include "chrome/common/resource_bundle.h"
+#include "chrome/common/url_constants.h"
+#include "googleurl/src/gurl.h"
+#include "grit/theme_resources.h"
+
+DOMUIThumbnailSource::DOMUIThumbnailSource(Profile* profile)
+    : DataSource(chrome::kChromeUIThumbnailPath, MessageLoop::current()),
+      profile_(profile) {
+}
+
+void DOMUIThumbnailSource::StartDataRequest(const std::string& path,
+                                            int request_id) {
+  HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  if (hs) {
+    HistoryService::Handle handle = hs->GetPageThumbnail(
+        GURL(path),
+        &cancelable_consumer_,
+        NewCallback(this, &DOMUIThumbnailSource::OnThumbnailDataAvailable));
+    // Attach the ChromeURLDataManager request ID to the history request.
+    cancelable_consumer_.SetClientData(hs, handle, request_id);
+  } else {
+    // Tell the caller that no thumbnail is available.
+    SendResponse(request_id, NULL);
+  }
+}
+
+void DOMUIThumbnailSource::OnThumbnailDataAvailable(
+    HistoryService::Handle request_handle,
+    scoped_refptr<RefCountedBytes> data) {
+  HistoryService* hs =
+      profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  int request_id = cancelable_consumer_.GetClientData(hs, request_handle);
+  // Forward the data along to the networking system.
+  if (data.get() && !data->data.empty()) {
+    SendResponse(request_id, data);
+  } else {
+    if (!default_thumbnail_.get()) {
+      default_thumbnail_ = new RefCountedBytes;
+      ResourceBundle::GetSharedInstance().LoadImageResourceBytes(
+          IDR_DEFAULT_THUMBNAIL, &default_thumbnail_->data);
+    }
+
+    SendResponse(request_id, default_thumbnail_);
+  }
+}
+