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

Side by Side Diff: trunk/src/chrome/common/net/url_fixer_upper.cc

Issue 228763004: Revert 262487 "Add net/base/filename_util.h." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/common/net/url_fixer_upper.h" 5 #include "chrome/common/net/url_fixer_upper.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #if defined(OS_POSIX) 9 #if defined(OS_POSIX)
10 #include "base/environment.h" 10 #include "base/environment.h"
11 #endif 11 #endif
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
17 #include "net/base/escape.h" 17 #include "net/base/escape.h"
18 #include "net/base/filename_util.h"
19 #include "net/base/net_util.h" 18 #include "net/base/net_util.h"
20 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 19 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
21 #include "url/url_file.h" 20 #include "url/url_file.h"
22 #include "url/url_parse.h" 21 #include "url/url_parse.h"
23 #include "url/url_util.h" 22 #include "url/url_util.h"
24 23
25 const char* URLFixerUpper::home_directory_override = NULL; 24 const char* URLFixerUpper::home_directory_override = NULL;
26 25
27 namespace { 26 namespace {
28 27
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 644
646 if (part->is_valid()) { 645 if (part->is_valid()) {
647 // Offset the location of this component. 646 // Offset the location of this component.
648 part->begin += offset; 647 part->begin += offset;
649 648
650 // This part might not have existed in the original text. 649 // This part might not have existed in the original text.
651 if (part->begin < 0) 650 if (part->begin < 0)
652 part->reset(); 651 part->reset();
653 } 652 }
654 } 653 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698