diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-26 21:49:35 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-26 21:49:35 +0000 |
| commit | 163200d8a7018cb54c442154ff65dc2ebd958f6f (patch) | |
| tree | 1833d16fd952aae38d5b3bf42d53978a219f14cb /chrome/browser/views/bookmark_bar_view.cc | |
| parent | 04d2c301427de6e7da85546437d286971cff1cff (diff) | |
| download | chromium_src-163200d8a7018cb54c442154ff65dc2ebd958f6f.zip chromium_src-163200d8a7018cb54c442154ff65dc2ebd958f6f.tar.gz chromium_src-163200d8a7018cb54c442154ff65dc2ebd958f6f.tar.bz2 | |
Resubmit http://codereview.chromium.org/314016 with views fixed
Review URL: http://codereview.chromium.org/338008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 1eb8d63..2bb0fc8 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -1708,8 +1708,8 @@ gfx::Size BookmarkBarView::LayoutItems(bool compute_bounds_only) { bool BookmarkBarView::ShouldShowSyncErrorButton() { bool show_sync_error_button(false); if (sync_service_ && sync_service_->HasSyncSetupCompleted()) { - std::wstring status_text; - std::wstring link_text; + string16 status_text; + string16 link_text; SyncStatusUIHelper::MessageType sync_status; sync_status = SyncStatusUIHelper::GetLabels( sync_service_, &status_text, &link_text); @@ -1737,4 +1737,3 @@ views::TextButton* BookmarkBarView::CreateSyncErrorButton() { return sync_error_button; } #endif // defined(BROWSER_SYNC) - |