Revert 110905 - Adding parameter to GetStatusLabels to indicate if links are acceptable, as some ...

chrome/browser/sync/sync_ui_util.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
 #define CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
 #pragma once
 
 #include <string>
 
@@ skipping 14 matching lines @@
 namespace sync_ui_util {
 
 enum MessageType {
   PRE_SYNCED,  // User has not set up sync.
   SYNCED,      // We are synced and authenticated to a gmail account.
   SYNC_ERROR,  // A sync error (such as invalid credentials) has occurred.
   SYNC_PROMO,  // A situation has occurred which should be brought to the user's
                // attention, but not as an error.
 };
 
-enum StatusLabelStyle {
-  PLAIN_TEXT,  // Label will be plain-text only.
-  WITH_HTML    // Label may contain an HTML-formatted link.
-};
-
 // TODO(akalin): audit the use of ProfileSyncService* service below,
 // and use const ProfileSyncService& service where possible.
 
 // Create status and link labels for the current status labels and link text
 // by querying |service|.
-// |style| sets the link properties, see |StatusLabelStyle|.
+// |status_label| may contain an HTML-formatted link.
 MessageType GetStatusLabels(ProfileSyncService* service,
-                            StatusLabelStyle style,
                             string16* status_label,
                             string16* link_label);
 
 // Same as above but for use specifically on the New Tab Page.
 // |status_label| may contain an HTML-formatted link.
 MessageType GetStatusLabelsForNewTabPage(ProfileSyncService* service,
                                          string16* status_label,
                                          string16* link_label);
 
 // Gets various labels for the sync global error based on the sync error state.
@@ skipping 33 matching lines @@
 
 // Returns a string describing the chrome version environment. Version format:
 // <Build Info> <OS> <Version number> (<Last change>)<channel or "-devel">
 // If version information is unavailable, returns "invalid."
 // TODO(zea): this approximately matches MakeUserAgentForSyncApi in
 // sync_backend_host.cc. Unify the two if possible.
 std::string GetVersionString();
 
 }  // namespace sync_ui_util
 #endif  // CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_