chrome/browser/ui/ash/screenshot_taker.cc - 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/ash/screenshot_taker.cc

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/ash/launcher/launcher_item_controller.cc ('k') | chrome/browser/ui/ash/session_state_delegate_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/screenshot_taker.cc

diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc

index d2f46c386c152cb2ade430c56057896b4efca4b9..5ea4276d979f143078460cff6ae20ba83c5fedfa 100644

--- a/chrome/browser/ui/ash/screenshot_taker.cc

+++ b/chrome/browser/ui/ash/screenshot_taker.cc

@@ -82,7 +82,7 @@ void CopyScreenshotToClipboard(scoped_refptr<base::RefCountedString> png_data) {

std::string html(kImageClipboardFormatPrefix);

html += encoded;

html += kImageClipboardFormatSuffix;

- scw.WriteHTML(UTF8ToUTF16(html), std::string());

+ scw.WriteHTML(base::UTF8ToUTF16(html), std::string());

}

content::RecordAction(content::UserMetricsAction("Screenshot_CopyClipboard"));

}

@@ -510,7 +510,7 @@ Notification* ScreenshotTaker::CreateNotification(

// We cancel a previous screenshot notification, if any, to ensure we get

// a fresh notification pop-up.

g_browser_process->notification_ui_manager()->CancelById(notification_id);

- const base::string16 replace_id(UTF8ToUTF16(notification_id));

+ const base::string16 replace_id(base::UTF8ToUTF16(notification_id));

bool success =

(screenshot_result == ScreenshotTakerObserver::SCREENSHOT_SUCCESS);

message_center::RichNotificationData optional_field;