diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 10:16:30 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 10:16:30 +0000 |
| commit | 8334e7c4cb13f6a736d694ec8bb1e48e47421c52 (patch) | |
| tree | 89916a2ec58d577b2fdea764b94fd11c5a1297ed /chrome/browser/dom_ui/conflicts_ui.cc | |
| parent | 96fd3a384522160ea9d11cd9bad573576ca10d06 (diff) | |
| download | chromium_src-8334e7c4cb13f6a736d694ec8bb1e48e47421c52.zip chromium_src-8334e7c4cb13f6a736d694ec8bb1e48e47421c52.tar.gz chromium_src-8334e7c4cb13f6a736d694ec8bb1e48e47421c52.tar.bz2 | |
Polish about:conflicts a bit as requested by Clem/UI review.
Add column header for data.
Move the Learn more link to appear last.
BUG=51105
TEST=None
Review URL: http://codereview.chromium.org/5981012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/conflicts_ui.cc')
| -rw-r--r-- | chrome/browser/dom_ui/conflicts_ui.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/dom_ui/conflicts_ui.cc b/chrome/browser/dom_ui/conflicts_ui.cc index ed51f21..9f4df7d 100644 --- a/chrome/browser/dom_ui/conflicts_ui.cc +++ b/chrome/browser/dom_ui/conflicts_ui.cc @@ -79,8 +79,8 @@ void ConflictsUIHTMLSource::StartDataRequest(const std::string& path, l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_SIGNED_BY)); localized_strings.SetString("headerLocation", l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_LOCATION)); - localized_strings.SetString("headerWarning", - l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_WARNING)); + localized_strings.SetString("headerVersion", + l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_VERSION)); localized_strings.SetString("headerHelpTip", l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_HELP_TIP)); @@ -108,7 +108,7 @@ void ConflictsUIHTMLSource::StartDataRequest(const std::string& path, // //////////////////////////////////////////////////////////////////////////////// -// The handler for Javascript messages for the about:flags page. +// The handler for JavaScript messages for the about:flags page. class ConflictsDOMHandler : public DOMMessageHandler, public NotificationObserver { public: |