summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/toolbar_view.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-25 03:54:40 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-25 03:54:40 +0000
commit40f04797e143e6b3fe59dbccdf7053aa2a7a2fe6 (patch)
tree0037cf6381a4876ee66f1f6330b0d1aef551815e /chrome/browser/views/toolbar_view.cc
parent6a7e698052d3b0d0aafebd5ac6af0ef2f95ff2a9 (diff)
downloadchromium_src-40f04797e143e6b3fe59dbccdf7053aa2a7a2fe6.zip
chromium_src-40f04797e143e6b3fe59dbccdf7053aa2a7a2fe6.tar.gz
chromium_src-40f04797e143e6b3fe59dbccdf7053aa2a7a2fe6.tar.bz2
Changed SyncStatusUIHelper namespace class into a real namespace (sync_ui_util), per style guide.
Changed static functions into anonymous-namespace functions. Renamed files/namespaces from sync_status_ui_helper to sync_ui_util. Moved sync_ui_util_mac.mm functions into sync_ui_util namespace. Updated all callers. BUG=none TEST=trybots Review URL: http://codereview.chromium.org/414065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/toolbar_view.cc')
-rw-r--r--chrome/browser/views/toolbar_view.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 736b1ee..29a1e7a 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -28,7 +28,7 @@
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/sync_status_ui_helper.h"
+#include "chrome/browser/sync/sync_ui_util.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/user_data_manager.h"
@@ -1183,12 +1183,12 @@ void ToolbarView::CreateAppMenu() {
string16 link;
// TODO(timsteele): Need a ui helper method to just get the type without
// needing labels.
- SyncStatusUIHelper::MessageType type = SyncStatusUIHelper::GetLabels(
+ sync_ui_util::MessageType type = sync_ui_util::GetStatusLabels(
browser_->profile()->GetOriginalProfile()->GetProfileSyncService(),
&label, &link);
- label = type == SyncStatusUIHelper::SYNCED ?
+ label = type == sync_ui_util::SYNCED ?
l10n_util::GetStringUTF16(IDS_SYNC_MENU_BOOKMARKS_SYNCED_LABEL) :
- type == SyncStatusUIHelper::SYNC_ERROR ?
+ type == sync_ui_util::SYNC_ERROR ?
l10n_util::GetStringUTF16(IDS_SYNC_MENU_BOOKMARK_SYNC_ERROR_LABEL) :
l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL);
app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, label);