components/supervised_user_error_page/supervised_user_error_page.cc - Issue 2712513004: Use a qualified path for grit-generated headers in components/

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: components/supervised_user_error_page/supervised_user_error_page.cc

Issue 2712513004: Use a qualified path for grit-generated headers in components/ (Closed)

Patch Set: res Created 3 years, 10 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

« components/security_interstitials/DEPS ('K') | « components/supervised_user_error_page/DEPS ('k') | components/supervised_user_error_page/supervised_user_error_page_android.cc » ('j') | components/supervised_user_error_page/supervised_user_error_page_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 "components/supervised_user_error_page/supervised_user_error_page.h"	5 #include "components/supervised_user_error_page/supervised_user_error_page.h"

6	6

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

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

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

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

11 #include "base/values.h"	11 #include "base/values.h"

12 #include "grit/components_resources.h"	12 #include "components/grit/components_resources.h"

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

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

15 #include "ui/base/resource/resource_bundle.h"	15 #include "ui/base/resource/resource_bundle.h"

16 #include "ui/base/webui/jstemplate_builder.h"	16 #include "ui/base/webui/jstemplate_builder.h"

17 #include "ui/base/webui/web_ui_util.h"	17 #include "ui/base/webui/web_ui_util.h"

18	18

19 namespace supervised_user_error_page {	19 namespace supervised_user_error_page {

20	20

21 namespace {	21 namespace {

22	22

23 static const int kAvatarSize1x = 45;	23 static const int kAvatarSize1x = 45;

(...skipping 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
167 std::string html =	167 std::string html =

168 ResourceBundle::GetSharedInstance()	168 ResourceBundle::GetSharedInstance()

169 .GetRawDataResource(IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML)	169 .GetRawDataResource(IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML)

170 .as_string();	170 .as_string();

171 webui::AppendWebUiCssTextDefaults(&html);	171 webui::AppendWebUiCssTextDefaults(&html);

172 std::string error_html = webui::GetI18nTemplateHtml(html, &strings);	172 std::string error_html = webui::GetI18nTemplateHtml(html, &strings);

173 return error_html;	173 return error_html;

174 }	174 }

175	175

176 } // namespace supervised_user_error_page	176 } // namespace supervised_user_error_page

OLD	NEW