chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm - Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm ('k') | chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

index 08a501e7b4b9f977327551f453b94f9f949a369d..95bacdd45de4ba73ed3315ff9cd0c2efef2eb9f5 100644

--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

@@ -276,7 +276,7 @@ void OmniboxViewMac::SetForcedQuery() {

const base::string16 current_text(GetText());

const size_t start = current_text.find_first_not_of(base::kWhitespaceUTF16);

if (start == base::string16::npos || (current_text[start] != '?')) {

- SetUserText(ASCIIToUTF16("?"));

+ SetUserText(base::ASCIIToUTF16("?"));

} else {

NSRange range = NSMakeRange(start + 1, current_text.size() - start - 1);

[[field_ currentEditor] setSelectedRange:range];

@@ -442,7 +442,7 @@ void OmniboxViewMac::ApplyTextAttributes(const base::string16& display_text,

AutocompleteInput::ParseForEmphasizeComponents(

display_text, &scheme, &host);

bool grey_out_url = display_text.substr(scheme.begin, scheme.len) ==

- UTF8ToUTF16(extensions::kExtensionScheme);

+ base::UTF8ToUTF16(extensions::kExtensionScheme);

if (model()->CurrentTextIsURL() &&

(host.is_nonempty() || grey_out_url)) {

[as addAttribute:NSForegroundColorAttributeName value:BaseTextColor()