chrome/browser/ui/webui/signin/user_manager_ui.cc - Issue 830743003: Directly inline shared WebUI CSS declarations into the security and supervised user interstitials.

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/signin/user_manager_ui.cc

Issue 830743003: Directly inline shared WebUI CSS declarations into the security and supervised user interstitials. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: review Created 5 years, 11 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

« chrome/browser/supervised_user/supervised_user_interstitial.cc ('K') | « chrome/browser/ui/webui/options/options_ui.cc ('k') | chrome/browser/ui/webui/system_info_ui.cc » ('j') | ui/base/webui/web_ui_util.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/signin/user_manager_ui.h"	5 #include "chrome/browser/ui/webui/signin/user_manager_ui.h"

6	6

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

8 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"	9 #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"

10 #include "chrome/browser/ui/webui/theme_source.h"	10 #include "chrome/browser/ui/webui/theme_source.h"

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52	52

53 source->SetDefaultResource(IDR_USER_MANAGER_HTML);	53 source->SetDefaultResource(IDR_USER_MANAGER_HTML);

54 source->AddResourcePath(kUserManagerJSPath, IDR_USER_MANAGER_JS);	54 source->AddResourcePath(kUserManagerJSPath, IDR_USER_MANAGER_JS);

55	55

56 return source;	56 return source;

57 }	57 }

58	58

59 void UserManagerUI::GetLocalizedStrings(	59 void UserManagerUI::GetLocalizedStrings(

60 base::DictionaryValue* localized_strings) {	60 base::DictionaryValue* localized_strings) {

61 user_manager_screen_handler_->GetLocalizedValues(localized_strings);	61 user_manager_screen_handler_->GetLocalizedValues(localized_strings);

62 webui::SetFontAndTextDirection(localized_strings);	62 webui::SetTextDirection(localized_strings);

63	63

64 #if defined(GOOGLE_CHROME_BUILD)	64 #if defined(GOOGLE_CHROME_BUILD)

65 localized_strings->SetString("buildType", "chrome");	65 localized_strings->SetString("buildType", "chrome");

66 #else	66 #else

67 localized_strings->SetString("buildType", "chromium");	67 localized_strings->SetString("buildType", "chromium");

68 #endif	68 #endif

69 }	69 }

70	70

OLD	NEW