diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 21:52:28 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 21:52:28 +0000 |
| commit | d742d2f41fd7035ef040a1b76bd5bcd93ae9b0ac (patch) | |
| tree | 1593105e3c5b59d87bcedbb465eb9d67500f3fdd /chrome/browser/views/toolbar_view.cc | |
| parent | 53556e1b386f14de94d97351e47774b97c0ed753 (diff) | |
| download | chromium_src-d742d2f41fd7035ef040a1b76bd5bcd93ae9b0ac.zip chromium_src-d742d2f41fd7035ef040a1b76bd5bcd93ae9b0ac.tar.gz chromium_src-d742d2f41fd7035ef040a1b76bd5bcd93ae9b0ac.tar.bz2 | |
Facelifts to sync UI
BUG=23136,24858,21596
TEST=SyncSetupWizardTest
Review URL: http://codereview.chromium.org/270081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/toolbar_view.cc')
| -rw-r--r-- | chrome/browser/views/toolbar_view.cc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 4c29e28..97b0381 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -20,14 +20,15 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" +#include "chrome/browser/sync/sync_status_ui_helper.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/user_data_manager.h" #include "chrome/browser/views/bookmark_menu_button.h" #include "chrome/browser/views/browser_actions_container.h" @@ -1133,8 +1134,18 @@ void ToolbarView::CreateAppMenu() { app_menu_contents_->AddSeparator(); #ifdef CHROME_PERSONALIZATION if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { - app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, - l10n_util::GetString(IDS_SYNC_MY_BOOKMARKS_LABEL) + L"..."); + std::wstring label; + std::wstring link; + // TODO(timsteele): Need a ui helper method to just get the type without + // needing labels. + SyncStatusUIHelper::MessageType type = SyncStatusUIHelper::GetLabels( + browser_->profile()->GetProfileSyncService(), &label, &link); + label = type == SyncStatusUIHelper::SYNCED ? + l10n_util::GetString(IDS_SYNC_MENU_BOOKMARKS_SYNCED_LABEL) : + type == SyncStatusUIHelper::SYNC_ERROR ? + l10n_util::GetString(IDS_SYNC_MENU_BOOKMARK_SYNC_ERROR_LABEL) : + l10n_util::GetString(IDS_SYNC_START_SYNC_BUTTON_LABEL); + app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, label); app_menu_contents_->AddSeparator(); } #endif |