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

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

Issue 3052034: base: Rename EnvVarGetter to Environment. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: review Created 10 years, 4 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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" 5 #include "chrome/browser/net/url_fixer_upper.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/env_var.h" 9 #include "base/environment.h"
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 "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.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"
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 url_parse::Parsed parts_utf8; 590 url_parse::Parsed parts_utf8;
591 std::string scheme_utf8 = SegmentURL(text_utf8, &parts_utf8); 591 std::string scheme_utf8 = SegmentURL(text_utf8, &parts_utf8);
592 UTF8PartsToWideParts(text_utf8, parts_utf8, parts); 592 UTF8PartsToWideParts(text_utf8, parts_utf8, parts);
593 return UTF8ToWide(scheme_utf8); 593 return UTF8ToWide(scheme_utf8);
594 } 594 }
595 GURL URLFixerUpper::FixupRelativeFile(const std::wstring& base_dir, 595 GURL URLFixerUpper::FixupRelativeFile(const std::wstring& base_dir,
596 const std::wstring& text) { 596 const std::wstring& text) {
597 return FixupRelativeFile(FilePath::FromWStringHack(base_dir), 597 return FixupRelativeFile(FilePath::FromWStringHack(base_dir),
598 FilePath::FromWStringHack(text)); 598 FilePath::FromWStringHack(text));
599 } 599 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698