chrome/browser/chromeos/login/screens/hid_detection_screen.cc - Issue 1358783002: Cleanup: Pass std::string as const reference from chrome/

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/chromeos/login/screens/hid_detection_screen.cc

Issue 1358783002: Cleanup: Pass std::string as const reference from chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase against ToT Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/screens/hid_detection_screen.h ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/hid_detection_screen.cc

diff --git a/chrome/browser/chromeos/login/screens/hid_detection_screen.cc b/chrome/browser/chromeos/login/screens/hid_detection_screen.cc

index 507c45c002a2d7fc406a50105245eef70dbdb8ad..8bece2de99c7141b4085cdbf7e3fe65d1fe92767 100644

--- a/chrome/browser/chromeos/login/screens/hid_detection_screen.cc

+++ b/chrome/browser/chromeos/login/screens/hid_detection_screen.cc

@@ -360,10 +360,11 @@ void HIDDetectionScreen::SendKeyboardDeviceNotification() {

!(pointing_device_id_.empty() && keyboard_device_id_.empty()));

}

-void HIDDetectionScreen::SetKeyboardDeviceName_(std::string name) {

- if (!(keyboard_device_id_.empty()) && name.empty())

- name = l10n_util::GetStringUTF8(IDS_HID_DETECTION_DEFAULT_KEYBOARD_NAME);

- keyboard_device_name_ = name;

+void HIDDetectionScreen::SetKeyboardDeviceName_(const std::string& name) {

+ keyboard_device_name_ =

+ keyboard_device_id_.empty() || !name.empty()

+ ? name

+ : l10n_util::GetStringUTF8(IDS_HID_DETECTION_DEFAULT_KEYBOARD_NAME);

}

void HIDDetectionScreen::DeviceAdded(

« no previous file with comments | « chrome/browser/chromeos/login/screens/hid_detection_screen.h ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »