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

Side by Side Diff: components/url_formatter/elide_url.cc

Issue 1549993003: Switch to standard integer types in components/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
« no previous file with comments | « components/url_formatter/elide_url.h ('k') | components/url_formatter/elide_url_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/url_formatter/elide_url.h" 5 #include "components/url_formatter/elide_url.h"
6 6
7 #include <stddef.h>
8
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
9 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "build/build_config.h"
10 #include "components/url_formatter/url_formatter.h" 13 #include "components/url_formatter/url_formatter.h"
11 #include "net/base/escape.h" 14 #include "net/base/escape.h"
12 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 15 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
13 #include "url/gurl.h" 16 #include "url/gurl.h"
14 #include "url/url_constants.h" 17 #include "url/url_constants.h"
15 18
16 #if !defined(OS_ANDROID) || defined(USE_AURA) 19 #if !defined(OS_ANDROID) || defined(USE_AURA)
17 #include "ui/gfx/text_elider.h" // nogncheck 20 #include "ui/gfx/text_elider.h" // nogncheck
18 #include "ui/gfx/text_utils.h" // nogncheck 21 #include "ui/gfx/text_utils.h" // nogncheck
19 #endif // !defined(OS_ANDROID) || defined(USE_AURA) 22 #endif // !defined(OS_ANDROID) || defined(USE_AURA)
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 return FormatUrlForSecurityDisplayInternal(url, languages, false); 363 return FormatUrlForSecurityDisplayInternal(url, languages, false);
361 } 364 }
362 365
363 base::string16 FormatUrlForSecurityDisplayOmitScheme( 366 base::string16 FormatUrlForSecurityDisplayOmitScheme(
364 const GURL& url, 367 const GURL& url,
365 const std::string& languages) { 368 const std::string& languages) {
366 return FormatUrlForSecurityDisplayInternal(url, languages, true); 369 return FormatUrlForSecurityDisplayInternal(url, languages, true);
367 } 370 }
368 371
369 } // namespace url_formatter 372 } // namespace url_formatter
OLDNEW
« no previous file with comments | « components/url_formatter/elide_url.h ('k') | components/url_formatter/elide_url_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698