chrome/browser/extensions/extension_error_ui.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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/extensions/extension_error_ui.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/extensions/extension_disabled_ui.cc ('k') | chrome/browser/extensions/extension_install_prompt.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/extensions/extension_error_ui.h"	5 #include "chrome/browser/extensions/extension_error_ui.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/strings/string16.h"	8 #include "base/strings/string16.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "chrome/browser/ui/global_error/global_error.h"	10 #include "chrome/browser/ui/global_error/global_error.h"

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

11 #include "extensions/common/extension.h"	12 #include "extensions/common/extension.h"

12 #include "extensions/common/extension_set.h"	13 #include "extensions/common/extension_set.h"

13 #include "grit/generated_resources.h"

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

15	15

16 namespace extensions {	16 namespace extensions {

17	17

18 namespace {	18 namespace {

19	19

20 base::string16 GenerateMessageSection(const ExtensionSet& extensions,	20 base::string16 GenerateMessageSection(const ExtensionSet& extensions,

21 int extension_template_message_id,	21 int extension_template_message_id,

22 int app_template_message_id) {	22 int app_template_message_id) {

23 CHECK(extension_template_message_id);	23 CHECK(extension_template_message_id);

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77 base::string16 ExtensionErrorUI::GenerateMessage() {	77 base::string16 ExtensionErrorUI::GenerateMessage() {

78 return GenerateMessageSection(delegate_->GetExternalExtensions(),	78 return GenerateMessageSection(delegate_->GetExternalExtensions(),

79 IDS_EXTENSION_ALERT_ITEM_EXTERNAL,	79 IDS_EXTENSION_ALERT_ITEM_EXTERNAL,

80 IDS_APP_ALERT_ITEM_EXTERNAL) +	80 IDS_APP_ALERT_ITEM_EXTERNAL) +

81 GenerateMessageSection(delegate_->GetBlacklistedExtensions(),	81 GenerateMessageSection(delegate_->GetBlacklistedExtensions(),

82 IDS_EXTENSION_ALERT_ITEM_BLACKLISTED,	82 IDS_EXTENSION_ALERT_ITEM_BLACKLISTED,

83 IDS_APP_ALERT_ITEM_BLACKLISTED);	83 IDS_APP_ALERT_ITEM_BLACKLISTED);

84 }	84 }

85	85

86 } // namespace extensions	86 } // namespace extensions

OLD	NEW