[Win] Don't show the add/remove desktop shortcut for single users.

chrome/browser/ui/webui/options/manage_profile_handler.cc

 // Copyright (c) 2013 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/webui/options/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 477 matching lines @@
 }
 
 void ManageProfileHandler::OnCreateSupervisedUserPrefChange() {
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   base::FundamentalValue allowed(
       prefs->GetBoolean(prefs::kSupervisedUserCreationAllowed));
   web_ui()->CallJavascriptFunction(
       "CreateProfileOverlay.updateSupervisedUsersAllowed", allowed);
 }
 
 void ManageProfileHandler::OnHasProfileShortcuts(bool has_shortcuts) {

[Dan Beam, 2014/09/04 22:59:09]

i'm slightly more partial to CHECK() than an if -> return if it means we're
doing less work.  when is this allowed to be called when !IsNewAvatarMenu and
GetNumberOfProfiles() <= 1?

[noms (inactive), 2014/09/05 14:54:41]

You can manually navigate to chrome://settings/manageProfille without the flag
on, and with only one user, so I don't think a check is going to work.

On 2014/09/04 22:59:09, Dan Beam wrote:

   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 

[Dan Beam, 2014/09/04 22:59:09]

nit: if the code stays as it:

if (!switches::IsNewAvatarMenu())
  return;

const ProfileInfoCache& cache =
    g_browser_process->profile_manager()->GetProfileInfoCache();
if (cache.GetNumberOfProfiles() <= 1)
  return;

const base::FundamentalValue has_shortcuts_value(has_shortcuts);
web_ui()->CallJavascriptFunction(
    "ManageProfileOverlay.receiveHasProfileShortcuts", has_shortcuts_value);

[noms (inactive), 2014/09/05 14:54:41]

Done.

-  const base::FundamentalValue has_shortcuts_value(has_shortcuts);
-  web_ui()->CallJavascriptFunction(
-      "ManageProfileOverlay.receiveHasProfileShortcuts", has_shortcuts_value);
+  // If --new-avatar-menu is on, don't show the add/remove desktop
+  // shortcut button in the single user case.
+  const ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
+  if (switches::IsNewAvatarMenu() && cache.GetNumberOfProfiles() > 1) {

[noms (inactive), 2014/09/04 21:24:13]

Question for you: Even in the pre-mirror world, if you had one user you could
still manually navigate to chrome://settings/manageProfile, in which case you
would see this add/remove desktop shortcut button. Do you think I should hide it
in the overlay regardless of whether -new-avatar-menu is turned off?

[Dan Beam, 2014/09/04 22:59:09]

i don't see it on Linux.  you should hide irrelevant UI, yes.

[noms (inactive), 2014/09/05 14:54:41]

This is just for Windows (Linux doesn't have desktop shortcuts). I've hidden the
UI in all cases.

On 2014/09/04 22:59:09, Dan Beam wrote:

+    const base::FundamentalValue has_shortcuts_value(has_shortcuts);
+    web_ui()->CallJavascriptFunction(
+        "ManageProfileOverlay.receiveHasProfileShortcuts", has_shortcuts_value);
+  }
 }
 
 void ManageProfileHandler::AddProfileShortcut(const base::ListValue* args) {
   base::FilePath profile_file_path;
   if (!GetProfilePathFromArgs(args, &profile_file_path))
     return;
 
   DCHECK(ProfileShortcutManager::IsFeatureEnabled());
   ProfileShortcutManager* shortcut_manager =
       g_browser_process->profile_manager()->profile_shortcut_manager();
@@ skipping 19 matching lines @@
 
   // Update the UI buttons.
   OnHasProfileShortcuts(false);
 }
 
 void ManageProfileHandler::RefreshGaiaPicture(const base::ListValue* args) {
   profiles::UpdateGaiaProfilePhotoIfNeeded(Profile::FromWebUI(web_ui()));
 }
 
 }  // namespace options