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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/dom_ui/conflicts_ui.cc

Issue 5981012: Polish about:conflicts a bit as requested by Clem/UI review.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/about_conflicts.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/conflicts_ui.cc
===================================================================
--- chrome/browser/dom_ui/conflicts_ui.cc (revision 70599)
+++ chrome/browser/dom_ui/conflicts_ui.cc (working copy)
@@ -79,8 +79,8 @@
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 @@
//
////////////////////////////////////////////////////////////////////////////////
-// 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:
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/about_conflicts.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698