Add and use a base::i18n::StringWithDirection for carrying titles.

base/i18n/rtl.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_I18N_RTL_H_
 #define BASE_I18N_RTL_H_
 #pragma once
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 12 matching lines @@
 const char16 kPopDirectionalFormatting = 0x202C;
 const char16 kLeftToRightOverride = 0x202D;
 const char16 kRightToLeftOverride = 0x202E;
 
 enum TextDirection {
   UNKNOWN_DIRECTION,
   RIGHT_TO_LEFT,
   LEFT_TO_RIGHT,
 };
 
+// A string along with the text direction it should be displayed in.
+// Conceptually this is a struct; we just use 'class' to make it easier for
+// others to forward-declare us with 'class String16WithDirection'.
+class String16WithDirection {
+public:
+  String16WithDirection() : direction_(UNKNOWN_DIRECTION) { }
+  String16WithDirection(const string16& str, TextDirection dir)
+      : string_(str), direction_(dir) { }
+
+  const string16& string() const { return string_; }
+  TextDirection direction() const { return direction_; }
+
+  bool empty() const { return string_.empty(); }

[darin (slow to review), 2011/04/21 18:03:30]

in chromium, we generally add a verb to methods like this:  "is_empty" or
"IsEmpty"... but maybe you are trying to make this look like std::string?

[Evan Martin, 2011/04/21 18:11:52]

In the equivalent WebKit review, I tried to add no methods and my reviewer
wanted me to make the methods match string, so I was attempting to head that off
here.  I will just remove it if you don't mind.

+
+  string16 string_;

[darin (slow to review), 2011/04/21 18:03:30]

nit: these should be marked private.

+  TextDirection direction_;
+};
+
 // Get the locale that the currently running process has been configured to use.
 // The return value is of the form language[-country] (e.g., en-US) where the
 // language is the 2 or 3 letter code from ISO-639.
 std::string GetConfiguredLocale();
 
 // Canonicalize a string (eg. a POSIX locale string) to a Chrome locale name.
 std::string GetCanonicalLocale(const char* locale);
 
 // Sets the default locale of ICU.
 // Once the application locale of Chrome in GetApplicationLocale is determined,
@@ skipping 96 matching lines @@
 // return the text itself. Explicit bidi control characters display and have
 // semantic effect. They can be deleted so they might not always appear in a
 // pair.
 const string16 StripWrappingBidiControlCharacters(const string16& text)
     WARN_UNUSED_RESULT;
 
 }  // namespace i18n
 }  // namespace base
 
 #endif  // BASE_I18N_RTL_H_