| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/net/url_fixer_upper.h" |
| 6 |
| 5 #include <algorithm> | 7 #include <algorithm> |
| 6 | 8 |
| 7 #include "chrome/browser/net/url_fixer_upper.h" | 9 #include "app/gfx/text_elider.h" |
| 8 | |
| 9 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| 10 #include "base/logging.h" | 11 #include "base/logging.h" |
| 11 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 12 #include "chrome/common/gfx/text_elider.h" | |
| 13 #include "chrome/common/url_constants.h" | 13 #include "chrome/common/url_constants.h" |
| 14 #include "googleurl/src/gurl.h" | 14 #include "googleurl/src/gurl.h" |
| 15 #include "googleurl/src/url_file.h" | 15 #include "googleurl/src/url_file.h" |
| 16 #include "googleurl/src/url_parse.h" | 16 #include "googleurl/src/url_parse.h" |
| 17 #include "googleurl/src/url_util.h" | 17 #include "googleurl/src/url_util.h" |
| 18 #include "net/base/escape.h" | 18 #include "net/base/escape.h" |
| 19 #include "net/base/net_util.h" | 19 #include "net/base/net_util.h" |
| 20 #include "net/base/registry_controlled_domain.h" | 20 #include "net/base/registry_controlled_domain.h" |
| 21 | 21 |
| 22 using namespace std; | 22 using namespace std; |
| (...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 } | 529 } |
| 530 wstring URLFixerUpper::FixupURL(const wstring& text, | 530 wstring URLFixerUpper::FixupURL(const wstring& text, |
| 531 const wstring& desired_tld) { | 531 const wstring& desired_tld) { |
| 532 return UTF8ToWide(FixupURL(WideToUTF8(text), WideToUTF8(desired_tld))); | 532 return UTF8ToWide(FixupURL(WideToUTF8(text), WideToUTF8(desired_tld))); |
| 533 } | 533 } |
| 534 wstring URLFixerUpper::FixupRelativeFile(const wstring& base_dir, | 534 wstring URLFixerUpper::FixupRelativeFile(const wstring& base_dir, |
| 535 const wstring& text) { | 535 const wstring& text) { |
| 536 return UTF8ToWide(FixupRelativeFile(FilePath::FromWStringHack(base_dir), | 536 return UTF8ToWide(FixupRelativeFile(FilePath::FromWStringHack(base_dir), |
| 537 FilePath::FromWStringHack(text))); | 537 FilePath::FromWStringHack(text))); |
| 538 } | 538 } |
| OLD | NEW |