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

Side by Side Diff: app/text_elider.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 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 | « app/l10n_util.cc ('k') | base/command_line.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 (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 <vector> 5 #include <vector>
6 6
7 #include "app/text_elider.h" 7 #include "app/text_elider.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/string_split.h"
10 #include "base/string_util.h" 11 #include "base/string_util.h"
11 #include "base/sys_string_conversions.h" 12 #include "base/sys_string_conversions.h"
12 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
13 #include "gfx/font.h" 14 #include "gfx/font.h"
14 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
15 #include "net/base/escape.h" 16 #include "net/base/escape.h"
16 #include "net/base/net_util.h" 17 #include "net/base/net_util.h"
17 #include "net/base/registry_controlled_domain.h" 18 #include "net/base/registry_controlled_domain.h"
18 19
19 namespace { 20 namespace {
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 string16 SortedDisplayURL::AfterHost() const { 440 string16 SortedDisplayURL::AfterHost() const {
440 size_t slash_index = display_url_.find(sort_host_, prefix_end_); 441 size_t slash_index = display_url_.find(sort_host_, prefix_end_);
441 if (slash_index == string16::npos) { 442 if (slash_index == string16::npos) {
442 NOTREACHED(); 443 NOTREACHED();
443 return string16(); 444 return string16();
444 } 445 }
445 return display_url_.substr(slash_index + sort_host_.length()); 446 return display_url_.substr(slash_index + sort_host_.length());
446 } 447 }
447 448
448 } // namespace gfx 449 } // namespace gfx
OLDNEW
« no previous file with comments | « app/l10n_util.cc ('k') | base/command_line.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698