Skip to content

GitLab

T
tangled
Commit 00b31698 authored by noamsml's avatar noamsml Committed by Commit bot
Browse files
Options

Do not show irrelevant registration promos to supervised and guest users 

Hide registration promos for supervised and guest users. Also hide cloud print
connector section and irrelevant "cloud devices" section (since users cannot log
in).

BUG=288614,340893

Review URL: https://codereview.chromium.org/521953002

Cr-Commit-Position: refs/heads/master@{#292806}
parent fd8bc125
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 9 deletions
chrome/browser/resources/local_discovery/local_discovery.html
View file @ 00b31698
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html i18n-values="dir:textdirection"> <html i18n-values="dir:textdirection">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
...@@ -136,6 +136,7 @@ ...@@ -136,6 +136,7 @@
</if> </if>
</div> </div>
<div id="my-devices-container">
<h2 i18n-content="myDevicesTitle"></h2> <h2 i18n-content="myDevicesTitle"></h2>
<div id="cloud-devices-loading" class="cloud-print-message" hidden> <div id="cloud-devices-loading" class="cloud-print-message" hidden>
<div class="inline-spinner"> </div> <span i18n-content="loading"></span> <div class="inline-spinner"> </div> <span i18n-content="loading"></span>
...@@ -155,6 +156,7 @@ ...@@ -155,6 +156,7 @@
<div id="cloud-devices"> <div id="cloud-devices">
</div> </div>
</div>
</div> </div>
<script src="chrome://resources/js/i18n_template2.js"></script> <script src="chrome://resources/js/i18n_template2.js"></script>
......
chrome/browser/resources/local_discovery/local_discovery.js
View file @ 00b31698
...@@ -45,6 +45,12 @@ cr.define('local_discovery', function() { ...@@ -45,6 +45,12 @@ cr.define('local_discovery', function() {
*/ */
var isUserLoggedIn = true; var isUserLoggedIn = true;
/**
* Whether or not the user is supervised or off the record.
* @type bool
*/
var isUserSupervisedOrOffTheRecord = false;
/** /**
* Whether or not the path-based dialog has been shown. * Whether or not the path-based dialog has been shown.
* @type bool * @type bool
...@@ -407,7 +413,8 @@ cr.define('local_discovery', function() { ...@@ -407,7 +413,8 @@ cr.define('local_discovery', function() {
$('register-login-promo').hidden = true; $('register-login-promo').hidden = true;
} else { } else {
$('no-printers-message').hidden = true; $('no-printers-message').hidden = true;
$('register-login-promo').hidden = isUserLoggedIn; $('register-login-promo').hidden = isUserLoggedIn ||
isUserSupervisedOrOffTheRecord;
} }
} }
...@@ -506,14 +513,24 @@ cr.define('local_discovery', function() { ...@@ -506,14 +513,24 @@ cr.define('local_discovery', function() {
/** /**
* User is not logged in. * User is not logged in.
*/ */
function setUserLoggedIn(userLoggedIn) { function setUserLoggedIn(userLoggedIn, userSupervisedOrOffTheRecord) {
isUserLoggedIn = userLoggedIn; isUserLoggedIn = userLoggedIn;
isUserSupervisedOrOffTheRecord = userSupervisedOrOffTheRecord;
$('cloud-devices-login-promo').hidden = isUserLoggedIn; $('cloud-devices-login-promo').hidden = isUserLoggedIn ||
$('register-overlay-login-promo').hidden = isUserLoggedIn; isUserSupervisedOrOffTheRecord;
$('register-continue-button').disabled = !isUserLoggedIn; $('register-overlay-login-promo').hidden = isUserLoggedIn ||
isUserSupervisedOrOffTheRecord;
$('register-continue-button').disabled = !isUserLoggedIn ||
isUserSupervisedOrOffTheRecord;
if (isUserLoggedIn) { $('my-devices-container').hidden = userSupervisedOrOffTheRecord;
if (isUserSupervisedOrOffTheRecord) {
$('cloud-print-connector-section').hidden = true;
}
if (isUserLoggedIn && !isUserSupervisedOrOffTheRecord) {
requestDeviceList(); requestDeviceList();
$('register-login-promo').hidden = true; $('register-login-promo').hidden = true;
} else { } else {
......
chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
View file @ 00b31698
...@@ -564,8 +564,9 @@ void LocalDiscoveryUIHandler::PrivetClientToV3( ...@@ -564,8 +564,9 @@ void LocalDiscoveryUIHandler::PrivetClientToV3(
void LocalDiscoveryUIHandler::CheckUserLoggedIn() { void LocalDiscoveryUIHandler::CheckUserLoggedIn() {
base::FundamentalValue logged_in_value(!GetSyncAccount().empty()); base::FundamentalValue logged_in_value(!GetSyncAccount().empty());
web_ui()->CallJavascriptFunction("local_discovery.setUserLoggedIn", base::FundamentalValue is_supervised_value(IsUserSupervisedOrOffTheRecord());
logged_in_value); web_ui()->CallJavascriptFunction(
"local_discovery.setUserLoggedIn", logged_in_value, is_supervised_value);
} }
void LocalDiscoveryUIHandler::CheckListingDone() { void LocalDiscoveryUIHandler::CheckListingDone() {
...@@ -636,6 +637,12 @@ void LocalDiscoveryUIHandler::CreatePrivetV3Client( ...@@ -636,6 +637,12 @@ void LocalDiscoveryUIHandler::CreatePrivetV3Client(
privet_resolution_->Start(); privet_resolution_->Start();
} }
bool LocalDiscoveryUIHandler::IsUserSupervisedOrOffTheRecord() {
Profile* profile = Profile::FromWebUI(web_ui());
return profile->IsSupervised() || profile->IsOffTheRecord();
}
#if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE) #if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE)
void LocalDiscoveryUIHandler::StartCloudPrintConnector() { void LocalDiscoveryUIHandler::StartCloudPrintConnector() {
Profile* profile = Profile::FromWebUI(web_ui()); Profile* profile = Profile::FromWebUI(web_ui());
......
chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h
View file @ 00b31698
...@@ -165,6 +165,8 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler, ...@@ -165,6 +165,8 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
void CheckListingDone(); void CheckListingDone();
bool IsUserSupervisedOrOffTheRecord();
#if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE) #if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE)
void StartCloudPrintConnector(); void StartCloudPrintConnector();
void OnCloudPrintPrefsChanged(); void OnCloudPrintPrefsChanged();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment