Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: chrome/browser/sync/sync_ui_util.h

Issue 8383036: Adding parameter to GetStatusLabels to indicate if links are acceptable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Further test fixes. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/sync/sync_global_error_unittest.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_ 5 #ifndef CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
6 #define CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_ 6 #define CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 14 matching lines...) Expand all
25 namespace sync_ui_util { 25 namespace sync_ui_util {
26 26
27 enum MessageType { 27 enum MessageType {
28 PRE_SYNCED, // User has not set up sync. 28 PRE_SYNCED, // User has not set up sync.
29 SYNCED, // We are synced and authenticated to a gmail account. 29 SYNCED, // We are synced and authenticated to a gmail account.
30 SYNC_ERROR, // A sync error (such as invalid credentials) has occurred. 30 SYNC_ERROR, // A sync error (such as invalid credentials) has occurred.
31 SYNC_PROMO, // A situation has occurred which should be brought to the user's 31 SYNC_PROMO, // A situation has occurred which should be brought to the user's
32 // attention, but not as an error. 32 // attention, but not as an error.
33 }; 33 };
34 34
35 enum StatusLabelStyle {
36 PLAIN_TEXT, // Label will be plain-text only.
37 WITH_HTML // Label may contain an HTML-formatted link.
38 };
39
35 // TODO(akalin): audit the use of ProfileSyncService* service below, 40 // TODO(akalin): audit the use of ProfileSyncService* service below,
36 // and use const ProfileSyncService& service where possible. 41 // and use const ProfileSyncService& service where possible.
37 42
38 // Create status and link labels for the current status labels and link text 43 // Create status and link labels for the current status labels and link text
39 // by querying |service|. 44 // by querying |service|.
40 // |status_label| may contain an HTML-formatted link. 45 // |style| sets the link properties, see |StatusLabelStyle|.
41 MessageType GetStatusLabels(ProfileSyncService* service, 46 MessageType GetStatusLabels(ProfileSyncService* service,
47 StatusLabelStyle style,
42 string16* status_label, 48 string16* status_label,
43 string16* link_label); 49 string16* link_label);
44 50
45 // Same as above but for use specifically on the New Tab Page. 51 // Same as above but for use specifically on the New Tab Page.
46 // |status_label| may contain an HTML-formatted link. 52 // |status_label| may contain an HTML-formatted link.
47 MessageType GetStatusLabelsForNewTabPage(ProfileSyncService* service, 53 MessageType GetStatusLabelsForNewTabPage(ProfileSyncService* service,
48 string16* status_label, 54 string16* status_label,
49 string16* link_label); 55 string16* link_label);
50 56
51 // Gets various labels for the sync global error based on the sync error state. 57 // Gets various labels for the sync global error based on the sync error state.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 91
86 // Returns a string describing the chrome version environment. Version format: 92 // Returns a string describing the chrome version environment. Version format:
87 // <Build Info> <OS> <Version number> (<Last change>)<channel or "-devel"> 93 // <Build Info> <OS> <Version number> (<Last change>)<channel or "-devel">
88 // If version information is unavailable, returns "invalid." 94 // If version information is unavailable, returns "invalid."
89 // TODO(zea): this approximately matches MakeUserAgentForSyncApi in 95 // TODO(zea): this approximately matches MakeUserAgentForSyncApi in
90 // sync_backend_host.cc. Unify the two if possible. 96 // sync_backend_host.cc. Unify the two if possible.
91 std::string GetVersionString(); 97 std::string GetVersionString();
92 98
93 } // namespace sync_ui_util 99 } // namespace sync_ui_util
94 #endif // CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_ 100 #endif // CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_global_error_unittest.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698