Add a SigninAllowed policy.

chrome/browser/ui/browser_command_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_command_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/shell_integration.h"
+#include "chrome/browser/signin/signin_manager.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_utils.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
@@ skipping 166 matching lines @@
                  base::Unretained(this)));
   profile_pref_registrar_.Add(
       prefs::kIncognitoModeAvailability,
       base::Bind(
           &BrowserCommandController::UpdateCommandsForIncognitoAvailability,
           base::Unretained(this)));
   profile_pref_registrar_.Add(
       prefs::kPrintingEnabled,
       base::Bind(&BrowserCommandController::UpdatePrintingState,
                  base::Unretained(this)));
+  pref_signin_allowed_.Init(prefs::kSigninAllowed,
+      profile()->GetOriginalProfile()->GetPrefs(),
+          base::Bind(&BrowserCommandController::OnSigninAllowedPrefChange,
+                     base::Unretained(this)));
 
   InitCommandState();
 
   TabRestoreService* tab_restore_service =
       TabRestoreServiceFactory::GetForProfile(profile());
   if (tab_restore_service) {
     tab_restore_service->AddObserver(this);
     TabRestoreServiceChanged(tab_restore_service);
   }
 }
@@ skipping 521 matching lines @@
 void BrowserCommandController::OnProfileNameChanged(
     const FilePath& profile_path,
     const string16& old_profile_name) {
 }
 
 void BrowserCommandController::OnProfileAvatarChanged(
     const FilePath& profile_path) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// BrowserCommandController, SigninPrefObserver implementation:
+
+void BrowserCommandController::OnSigninAllowedPrefChange() {
+  // For unit tests, we don't have a window.
+  if (!window())
+    return;
+  const bool show_main_ui = IsShowingMainUI(window()->IsFullscreen());
+  command_updater_.UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP,

[sail, 2013/02/08 20:18:57]

Move the code to update this state into a single function.

[Adrian Kuegel, 2013/02/11 16:47:30]

Done. Note that I had to pass show_main_ui as a parameter to the function, as
this value is determined differently at the three locations where the
IDC_SHOW_SYNC_SETUP command is updated. 

+      show_main_ui && pref_signin_allowed_.GetValue());
+}
+
 // BrowserCommandController, TabStripModelObserver implementation:
 
 void BrowserCommandController::TabInsertedAt(WebContents* contents,
                                              int index,
                                              bool foreground) {
   AddInterstitialObservers(contents);
 }
 
 void BrowserCommandController::TabDetachedAt(WebContents* contents, int index) {
   RemoveInterstitialObservers(contents);
@@ skipping 120 matching lines @@
                                         !profile()->IsGuestSession());
   command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
   command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_KEYBOARD, true);
   command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_MENU, true);
   command_updater_.UpdateCommandEnabled(IDC_BOOKMARKS_MENU,
                                         !profile()->IsGuestSession());
   command_updater_.UpdateCommandEnabled(IDC_RECENT_TABS_MENU,
                                         !profile()->IsGuestSession() &&
                                         !profile()->IsOffTheRecord());
 
-  command_updater_.UpdateCommandEnabled(IDC_SHOW_SIGNIN, true);
+  command_updater_.UpdateCommandEnabled(
+      IDC_SHOW_SYNC_SETUP,
+      profile()->GetOriginalProfile()->IsSigninAllowed());
 
   // Initialize other commands based on the window type.
   bool normal_window = browser_->is_type_tabbed();
 
   // Navigation commands
   command_updater_.UpdateCommandEnabled(IDC_HOME, normal_window);
 
   // Window management commands
   command_updater_.UpdateCommandEnabled(IDC_SELECT_NEXT_TAB, normal_window);
   command_updater_.UpdateCommandEnabled(IDC_SELECT_PREVIOUS_TAB,
@@ skipping 214 matching lines @@
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_NEXT_PANE, main_not_fullscreen);
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_PREVIOUS_PANE, main_not_fullscreen);
   command_updater_.UpdateCommandEnabled(
       IDC_FOCUS_BOOKMARKS, main_not_fullscreen);
 
   // Show various bits of UI
   command_updater_.UpdateCommandEnabled(IDC_DEVELOPER_MENU, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_FEEDBACK, show_main_ui);
+  command_updater_.UpdateCommandEnabled(IDC_SHOW_SYNC_SETUP,
+      show_main_ui && profile()->GetOriginalProfile()->IsSigninAllowed());
 
   // Settings page/subpages are forced to open in normal mode. We disable these
   // commands when incognito is forced.
   const bool options_enabled = show_main_ui &&
       IncognitoModePrefs::GetAvailability(
           profile()->GetPrefs()) != IncognitoModePrefs::FORCED;
   command_updater_.UpdateCommandEnabled(IDC_OPTIONS, options_enabled);
   command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, options_enabled);
 
   command_updater_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, show_main_ui);
@@ skipping 103 matching lines @@
 
 BrowserWindow* BrowserCommandController::window() {
   return browser_->window();
 }
 
 Profile* BrowserCommandController::profile() {
   return browser_->profile();
 }
 
 }  // namespace chrome