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

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

Index: chrome/browser/ui/webui/options/manage_profile_handler.cc
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc
index 41689f80a6da7c7bc0cc5074cfee7277a5f75cda..4806e44699d48130a4ae77ed0ccf8801c81ccb00 100644
--- a/chrome/browser/ui/webui/options/manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc
@@ -498,9 +498,15 @@ void ManageProfileHandler::OnCreateSupervisedUserPrefChange() {
 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) {