diff options
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/policy/configuration_policy_handler_list_factory.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/resources/user_manager/user_manager.js | 10 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/signin/user_manager_screen_handler.cc | 25 | ||||
| -rw-r--r-- | chrome/common/pref_names.cc | 3 | ||||
| -rw-r--r-- | chrome/common/pref_names.h | 1 | ||||
| -rw-r--r-- | chrome/test/data/policy/policy_test_cases.json | 10 | ||||
| -rw-r--r-- | components/policy/resources/policy_templates.json | 18 | ||||
| -rw-r--r-- | tools/metrics/histograms/histograms.xml | 1 |
9 files changed, 7 insertions, 66 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index d6904b0..01cac71 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -772,8 +772,6 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false); - registry->RegisterBooleanPref(prefs::kBrowserGuestModeEnabled, true); - #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) registry->RegisterBooleanPref(prefs::kEulaAccepted, false); #endif // defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS) diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc index d33a32f..8c6be3a 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -488,9 +488,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { { key::kNativeMessagingUserLevelHosts, extensions::pref_names::kNativeMessagingUserLevelHosts, base::Value::TYPE_BOOLEAN }, - { key::kBrowserGuestModeEnabled, - prefs::kBrowserGuestModeEnabled, - base::Value::TYPE_BOOLEAN }, #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) }; diff --git a/chrome/browser/resources/user_manager/user_manager.js b/chrome/browser/resources/user_manager/user_manager.js index f22b94a..f165f48 100644 --- a/chrome/browser/resources/user_manager/user_manager.js +++ b/chrome/browser/resources/user_manager/user_manager.js @@ -33,17 +33,13 @@ cr.define('cr.ui', function() { * Shows the given screen. * @param {Object} screen Screen params dict, e.g. {id: screenId, data: data} */ - Oobe.showUserManagerScreen = function(showGuest) { + Oobe.showUserManagerScreen = function() { Oobe.getInstance().showScreen({id: 'account-picker', data: {disableAddUser: false}}); // The ChromeOS account-picker will hide the AddUser button if a user is // logged in and the screen is "locked", so we must re-enabled it $('add-user-header-bar-item').hidden = false; - // Hide the Guest Mode option if the user is not permitted to select it. - $('guest-user-button').hidden = !showGuest; - $('login-header-bar').hidden = false; - // Disable the context menu, as the Print/Inspect element items don't // make sense when displayed as a widget. document.addEventListener('contextmenu', function(e) {e.preventDefault();}); @@ -133,10 +129,6 @@ cr.define('UserManager', function() { login.AccountPickerScreen.register(); cr.ui.Bubble.decorate($('bubble')); login.HeaderBar.decorate($('login-header-bar')); - - // Hide the header bar until the showUserManagerMethod can apply function - // parameters that affect widget visiblity. - $('login-header-bar').hidden = true; chrome.send('userManagerInitialize'); } diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc index 7e219de4..589e8fe 100644 --- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc +++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h" #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "base/value_conversions.h" #include "base/values.h" @@ -22,7 +21,6 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/singleton_tabs.h" -#include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" @@ -145,12 +143,6 @@ extensions::ScreenlockPrivateEventRouter* GetScreenlockRouter( profile); } -bool IsGuestModeEnabled() { - PrefService* service = g_browser_process->local_state(); - DCHECK(service); - return service->GetBoolean(prefs::kBrowserGuestModeEnabled); -} - } // namespace // ProfileUpdateObserver ------------------------------------------------------ @@ -291,8 +283,7 @@ void UserManagerScreenHandler::Unlock(const std::string& user_email) { void UserManagerScreenHandler::HandleInitialize(const base::ListValue* args) { SendUserList(); - web_ui()->CallJavascriptFunction("cr.ui.Oobe.showUserManagerScreen", - base::FundamentalValue(IsGuestModeEnabled())); + web_ui()->CallJavascriptFunction("cr.ui.Oobe.showUserManagerScreen"); desktop_type_ = chrome::GetHostDesktopTypeForNativeView( web_ui()->GetWebContents()->GetNativeView()); @@ -379,15 +370,9 @@ void UserManagerScreenHandler::HandleRemoveUser(const base::ListValue* args) { } void UserManagerScreenHandler::HandleLaunchGuest(const base::ListValue* args) { - if (IsGuestModeEnabled()) { - profiles::SwitchToGuestProfile(desktop_type_, - base::Bind(&OnSwitchToProfileComplete)); - ProfileMetrics::LogProfileSwitchUser(ProfileMetrics::SWITCH_PROFILE_GUEST); - } else { - // The UI should have prevented the user from allowing the selection of - // guest mode. - NOTREACHED(); - } + profiles::SwitchToGuestProfile(desktop_type_, + base::Bind(&OnSwitchToProfileComplete)); + ProfileMetrics::LogProfileSwitchUser(ProfileMetrics::SWITCH_PROFILE_GUEST); } void UserManagerScreenHandler::HandleLaunchUser(const base::ListValue* args) { @@ -645,7 +630,7 @@ void UserManagerScreenHandler::SendUserList() { } web_ui()->CallJavascriptFunction("login.AccountPickerScreen.loadUsers", - users_list, base::FundamentalValue(IsGuestModeEnabled())); + users_list, base::FundamentalValue(true)); } void UserManagerScreenHandler::ReportAuthenticationResult( diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index db93a04..bae18c5 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -2303,7 +2303,4 @@ const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; // Whether DNS Quick Check is disabled in proxy resolution. const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; -// Whether Guest Mode is enabled within the browser. -const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled"; - } // namespace prefs diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 42a33d1..68b9a6f 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -815,7 +815,6 @@ extern const char kPartnerBookmarkMappings[]; #endif extern const char kQuickCheckEnabled[]; -extern const char kBrowserGuestModeEnabled[]; } // namespace prefs diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json index a603c34..3287837 100644 --- a/chrome/test/data/policy/policy_test_cases.json +++ b/chrome/test/data/policy/policy_test_cases.json @@ -1649,16 +1649,6 @@ "indicator_selector": "#wallpaper-indicator" }, - "BrowserGuestModeEnabled": { - "os": ["win", "linux", "mac"], - "test_policy": { "BrowserGuestModeEnabled": true }, - "pref_mappings": [ - { "pref": "profile.browser_guest_enabled", - "local_state": true - } - ] - }, - "----- Chrome OS policies ------------------------------------------------": {}, "ChromeOsLockOnIdleSuspend": { diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json index 4f77f62..6df8e8f 100644 --- a/components/policy/resources/policy_templates.json +++ b/components/policy/resources/policy_templates.json @@ -120,7 +120,7 @@ # persistent IDs for all fields (but not for groups!) are needed. These are # specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs, # because doing so would break the deployed wire format! -# For your editing convenience: highest ID currently used: 274 +# For your editing convenience: highest ID currently used: 273 # # Placeholders: # The following placeholder strings are automatically substituted: @@ -6613,22 +6613,6 @@ If this policy is left not set, EasyUnlock is allowed if the requirements for the feature are satified. ''', }, - { - 'name': 'BrowserGuestModeEnabled', - 'type': 'main', - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:39-'], - 'features': { - 'dynamic_refresh': True, - 'per_profile': False, - }, - 'example_value': True, - 'id': 274, - 'caption': '''Enable guest mode in browser''', - 'desc': '''If this policy is set to true or not configured, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will enable guest logins. Guest logins are <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> profiles where all windows are in incognito mode. - - If this policy is set to false, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not allow guest profiles to be started.''', - }, ], 'messages': { # Messages that are not associated to any policies. diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index f0f9e1e..a0bf846 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml @@ -38316,7 +38316,6 @@ Therefore, the affected-histogram name has to have at least one dot in it. <int value="271" label="Transfer SAML IdP cookies during login"/> <int value="272" label="Enable EasyUnlock"/> <int value="273" label="Enable network prediction"/> - <int value="274" label="Enable guest mode in the browser"/> </enum> <enum name="EnterprisePolicyInvalidations" type="int"> |