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

Side by Side Diff: chrome/browser/autocomplete/autocomplete_input.cc

Issue 113403006: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | chrome/browser/autocomplete/autocomplete_match.h » ('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) 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/browser/autocomplete/autocomplete_input.h" 5 #include "chrome/browser/autocomplete/autocomplete_input.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/external_protocol/external_protocol_handler.h" 9 #include "chrome/browser/external_protocol/external_protocol_handler.h"
10 #include "chrome/browser/profiles/profile_io_data.h" 10 #include "chrome/browser/profiles/profile_io_data.h"
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 *host = parts.inner_parsed()->host; 467 *host = parts.inner_parsed()->host;
468 } 468 }
469 } 469 }
470 470
471 // static 471 // static
472 base::string16 AutocompleteInput::FormattedStringWithEquivalentMeaning( 472 base::string16 AutocompleteInput::FormattedStringWithEquivalentMeaning(
473 const GURL& url, 473 const GURL& url,
474 const base::string16& formatted_url) { 474 const base::string16& formatted_url) {
475 if (!net::CanStripTrailingSlash(url)) 475 if (!net::CanStripTrailingSlash(url))
476 return formatted_url; 476 return formatted_url;
477 const base::string16 url_with_path(formatted_url + char16('/')); 477 const base::string16 url_with_path(formatted_url + base::char16('/'));
478 return (AutocompleteInput::Parse(formatted_url, base::string16(), NULL, NULL, 478 return (AutocompleteInput::Parse(formatted_url, base::string16(), NULL, NULL,
479 NULL) == 479 NULL) ==
480 AutocompleteInput::Parse(url_with_path, base::string16(), NULL, NULL, 480 AutocompleteInput::Parse(url_with_path, base::string16(), NULL, NULL,
481 NULL)) ? 481 NULL)) ?
482 formatted_url : url_with_path; 482 formatted_url : url_with_path;
483 } 483 }
484 484
485 // static 485 // static
486 int AutocompleteInput::NumNonHostComponents(const url_parse::Parsed& parts) { 486 int AutocompleteInput::NumNonHostComponents(const url_parse::Parsed& parts) {
487 int num_nonhost_components = 0; 487 int num_nonhost_components = 0;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 current_page_classification_ = AutocompleteInput::INVALID_SPEC; 530 current_page_classification_ = AutocompleteInput::INVALID_SPEC;
531 type_ = INVALID; 531 type_ = INVALID;
532 parts_ = url_parse::Parsed(); 532 parts_ = url_parse::Parsed();
533 scheme_.clear(); 533 scheme_.clear();
534 canonicalized_url_ = GURL(); 534 canonicalized_url_ = GURL();
535 prevent_inline_autocomplete_ = false; 535 prevent_inline_autocomplete_ = false;
536 prefer_keyword_ = false; 536 prefer_keyword_ = false;
537 allow_exact_keyword_match_ = false; 537 allow_exact_keyword_match_ = false;
538 matches_requested_ = ALL_MATCHES; 538 matches_requested_ = ALL_MATCHES;
539 } 539 }
OLDNEW
« no previous file with comments | « ash/system/user/tray_user.cc ('k') | chrome/browser/autocomplete/autocomplete_match.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698