Updates the UI and reenables the fix introduced in commit 256939

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/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 17 matching lines @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/webui/options/options_handlers_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
+#include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 
 #if defined(ENABLE_SETTINGS_APP)
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "content/public/browser/web_contents.h"
 #endif
 
@@ skipping 50 matching lines @@
     { "manageProfilesManagedNotSignedInLink",
         IDS_PROFILES_CREATE_MANAGED_NOT_SIGNED_IN_LINK },
     { "deleteProfileTitle", IDS_PROFILES_DELETE_TITLE },
     { "deleteProfileOK", IDS_PROFILES_DELETE_OK_BUTTON_LABEL },
     { "deleteProfileMessage", IDS_PROFILES_DELETE_MESSAGE },
     { "deleteManagedProfileAddendum", IDS_PROFILES_DELETE_MANAGED_ADDENDUM },
     { "disconnectManagedProfileTitle",
         IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TITLE },
     { "disconnectManagedProfileOK",
         IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_OK_BUTTON_LABEL },
-    { "disconnectManagedProfileText",
-        IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TEXT },
-    { "disconnectManagedProfileLearnMore",
-        IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_LEARN_MORE },
     { "createProfileTitle", IDS_PROFILES_CREATE_TITLE },
     { "createProfileInstructions", IDS_PROFILES_CREATE_INSTRUCTIONS },
     { "createProfileConfirm", IDS_PROFILES_CREATE_CONFIRM },
     { "createProfileShortcutCheckbox", IDS_PROFILES_CREATE_SHORTCUT_CHECKBOX },
     { "createProfileShortcutButton", IDS_PROFILES_CREATE_SHORTCUT_BUTTON },
     { "removeProfileShortcutButton", IDS_PROFILES_REMOVE_SHORTCUT_BUTTON },
     { "importExistingManagedUserLink",
         IDS_PROFILES_IMPORT_EXISTING_MANAGED_USER_LINK },
     { "signInToImportManagedUsers",
         IDS_PROFILES_IMPORT_MANAGED_USER_NOT_SIGNED_IN },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "manageProfile",
                 IDS_PROFILES_MANAGE_TITLE);
   RegisterTitle(localized_strings, "createProfile",
                 IDS_PROFILES_CREATE_TITLE);
 
   localized_strings->SetBoolean("profileShortcutsEnabled",
                                 ProfileShortcutManager::IsFeatureEnabled());
 
-  localized_strings->SetString("enterpriseManagedAccountHelpURL",
-                               chrome::kEnterpriseManagedAccountHelpURL);
+  localized_strings->SetString(
+      "disconnectManagedProfileText",
+      l10n_util::GetStringFUTF16(
+          IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TEXT,
+          base::UTF8ToUTF16(chrome::kSyncGoogleDashboardURL)));
+
+  Profile* profile = Profile::FromWebUI(web_ui());
+  std::string domain_name = "unknown";

[Andrew T Wilson (Slow), 2014/04/24 15:46:17]

Either leave this blank (no default domain name) or else make this a localized
string. Don't hard-code an english string here.

[kaliamoorthi, 2014/04/24 21:42:15]

I have removed the default.

+  if (profile && !profile->GetProfileName().empty())

[Andrew T Wilson (Slow), 2014/04/24 15:46:17]

Is "profile->GetProfileName()" really what you want here? Or should you instead
grab SigninManager::GetAuthenticatedUsername()? I'm pretty sure
SigninManager::GetAuthenticatedUsername() is what you want.

[kaliamoorthi, 2014/04/24 21:42:15]

Done.

+    domain_name = gaia::ExtractDomainName(profile->GetProfileName());
+
+  // If there is no one logged in or if the profile name is empty then the
+  // domain name is unknown. This happens in browser tests.
+  localized_strings->SetString(
+      "disconnectManagedProfileDomainInformation",
+      l10n_util::GetStringFUTF16(
+          IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_DOMAIN_INFORMATION,
+          base::ASCIIToUTF16("<b>" + domain_name + "</b>")));

[Andrew T Wilson (Slow), 2014/04/24 15:46:17]

I'm OK with this, but I wonder if instead the <b> should be part of the
localized string?

[Patrick Dubroy, 2014/04/24 16:20:11]

I don't think it should be part of the localized string. And rather than using
<b>, you should probably use <span class+"managedDomain"> or something, and use
CSS to make the text bold.

[kaliamoorthi, 2014/04/24 21:42:15]

I chose Patrick's solution for this one. The reason is I couldn't make the
decoration part of the localized string. The compiler complained.

[kaliamoorthi, 2014/04/24 21:42:15]

Done.

 }
 
 void ManageProfileHandler::InitializeHandler() {
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
                  content::NotificationService::AllSources());
 
   Profile* profile = Profile::FromWebUI(web_ui());
   pref_change_registrar_.Init(profile->GetPrefs());
   pref_change_registrar_.Add(
       prefs::kManagedUserCreationAllowed,
@@ skipping 334 matching lines @@
     g_browser_process->profile_manager()->profile_shortcut_manager();
   DCHECK(shortcut_manager);
 
   shortcut_manager->RemoveProfileShortcuts(profile_file_path);
 
   // Update the UI buttons.
   OnHasProfileShortcuts(false);
 }
 
 }  // namespace options