ash/system/devicetype_utils.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ash/system/devicetype_utils.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase Created 3 years, 9 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 | « ash/system/devicetype_utils.h ('k') | ash/system/enterprise/enterprise_domain_observer.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "ash/common/system/chromeos/devicetype_utils.h"	5 #include "ash/system/devicetype_utils.h"

6	6

7 #include "ash/strings/grit/ash_strings.h"	7 #include "ash/strings/grit/ash_strings.h"

8 #include "chromeos/system/devicetype.h"	8 #include "chromeos/system/devicetype.h"

9 #include "ui/base/l10n/l10n_util.h"	9 #include "ui/base/l10n/l10n_util.h"

10	10

11 namespace ash {	11 namespace ash {

12	12

13 base::string16 SubstituteChromeOSDeviceType(int resource_id) {	13 base::string16 SubstituteChromeOSDeviceType(int resource_id) {

14 return l10n_util::GetStringFUTF16(resource_id, GetChromeOSDeviceName());	14 return l10n_util::GetStringFUTF16(resource_id, GetChromeOSDeviceName());

15 }	15 }

(...skipping 12 matching lines...) Expand all Loading...
28 return IDS_ASH_CHROMEBOX;	28 return IDS_ASH_CHROMEBOX;

29 case chromeos::DeviceType::kChromebit:	29 case chromeos::DeviceType::kChromebit:

30 return IDS_ASH_CHROMEBIT;	30 return IDS_ASH_CHROMEBIT;

31 case chromeos::DeviceType::kUnknown:	31 case chromeos::DeviceType::kUnknown:

32 default:	32 default:

33 return IDS_ASH_CHROMEDEVICE;	33 return IDS_ASH_CHROMEDEVICE;

34 }	34 }

35 }	35 }

36	36

37 } // namespace ash	37 } // namespace ash

OLD	NEW