Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(231)

Side by Side Diff: chrome/browser/net/url_fixer_upper.cc

Issue 18305: Move url_* to net subdir (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/net/url_fixer_upper.h ('k') | chrome/browser/net/url_fixer_upper_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/chrome/browser/url_fixer_upper.cc:r69-2775
OLDNEW
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 <algorithm> 5 #include <algorithm>
6 #include <windows.h> 6 #include <windows.h>
7 7
8 #include "chrome/browser/url_fixer_upper.h" 8 #include "chrome/browser/net/url_fixer_upper.h"
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "chrome/common/gfx/text_elider.h" 13 #include "chrome/common/gfx/text_elider.h"
14 #include "googleurl/src/gurl.h" 14 #include "googleurl/src/gurl.h"
15 #include "googleurl/src/url_canon.h" 15 #include "googleurl/src/url_canon.h"
16 #include "googleurl/src/url_file.h" 16 #include "googleurl/src/url_file.h"
17 #include "googleurl/src/url_parse.h" 17 #include "googleurl/src/url_parse.h"
18 #include "googleurl/src/url_util.h" 18 #include "googleurl/src/url_util.h"
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 GURL file_url = net::FilePathToFileURL(full_path); 430 GURL file_url = net::FilePathToFileURL(full_path);
431 if (file_url.is_valid()) 431 if (file_url.is_valid())
432 return gfx::ElideUrl(file_url, ChromeFont(), 0, std::wstring()); 432 return gfx::ElideUrl(file_url, ChromeFont(), 0, std::wstring());
433 // Invalid files fall through to regular processing. 433 // Invalid files fall through to regular processing.
434 } 434 }
435 435
436 // Fall back on regular fixup for this input. 436 // Fall back on regular fixup for this input.
437 return FixupURL(text, L""); 437 return FixupURL(text, L"");
438 } 438 }
439 439
OLDNEW
« no previous file with comments | « chrome/browser/net/url_fixer_upper.h ('k') | chrome/browser/net/url_fixer_upper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698