chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc - Issue 2917423002: Revert of chromeos: Remove SystemTrayDelegate::GetIMEManagedMessage()

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: chrome/browser/ui/webui/policy_indicator_localized_strings_provider.cc

Issue 2917423002: Revert of chromeos: Remove SystemTrayDelegate::GetIMEManagedMessage() (Closed)

Patch Set: Created 3 years, 6 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 | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | components/policy_strings.grdp » ('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 "chrome/browser/ui/webui/policy_indicator_localized_strings_provider.h"	5 #include "chrome/browser/ui/webui/policy_indicator_localized_strings_provider.h"

6	6

7 #include "build/build_config.h"	7 #include "build/build_config.h"

8 #include "chrome/grit/generated_resources.h"	8 #include "chrome/grit/generated_resources.h"

9 #include "components/strings/grit/components_strings.h"

10 #include "content/public/browser/web_ui_data_source.h"	9 #include "content/public/browser/web_ui_data_source.h"

11	10

12 namespace policy_indicator {	11 namespace policy_indicator {

13	12

14 void AddLocalizedStrings(content::WebUIDataSource* html_source) {	13 void AddLocalizedStrings(content::WebUIDataSource* html_source) {

15 html_source->AddLocalizedString("controlledSettingPolicy",	14 html_source->AddLocalizedString("controlledSettingPolicy",

16 IDS_OPTIONS_CONTROLLED_SETTING_POLICY);	15 IDS_OPTIONS_CONTROLLED_SETTING_POLICY);

17 html_source->AddLocalizedString("controlledSettingRecommendedMatches",	16 html_source->AddLocalizedString("controlledSettingRecommendedMatches",

18 IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED);	17 IDS_OPTIONS_CONTROLLED_SETTING_RECOMMENDED);

19 html_source->AddLocalizedString(	18 html_source->AddLocalizedString(

20 "controlledSettingRecommendedDiffers",	19 "controlledSettingRecommendedDiffers",

21 IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION);	20 IDS_OPTIONS_CONTROLLED_SETTING_HAS_RECOMMENDATION);

22 html_source->AddLocalizedString("controlledSettingExtension",	21 html_source->AddLocalizedString("controlledSettingExtension",

23 IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION);	22 IDS_OPTIONS_CONTROLLED_SETTING_EXTENSION);

24 #if defined(OS_CHROMEOS)	23 #if defined(OS_CHROMEOS)

25 html_source->AddLocalizedString("controlledSettingShared",	24 html_source->AddLocalizedString("controlledSettingShared",

26 IDS_OPTIONS_CONTROLLED_SETTING_SHARED);	25 IDS_OPTIONS_CONTROLLED_SETTING_SHARED);

27 html_source->AddLocalizedString("controlledSettingOwner",	26 html_source->AddLocalizedString("controlledSettingOwner",

28 IDS_OPTIONS_CONTROLLED_SETTING_OWNER);	27 IDS_OPTIONS_CONTROLLED_SETTING_OWNER);

29 #endif	28 #endif

30 }	29 }

31	30

32 } // namespace policy_indicator	31 } // namespace policy_indicator

OLD	NEW