| Index: chrome/common/extensions/manifest_handlers/theme_handler.cc
|
| diff --git a/chrome/common/extensions/manifest_handlers/theme_handler.cc b/chrome/common/extensions/manifest_handlers/theme_handler.cc
|
| index 059ad98a112a0f4071fa590b9f74d8b566c69e5a..6d1c5365ac6081f7fcedf6fc20b4bfdd8ae85e3c 100644
|
| --- a/chrome/common/extensions/manifest_handlers/theme_handler.cc
|
| +++ b/chrome/common/extensions/manifest_handlers/theme_handler.cc
|
| @@ -21,7 +21,7 @@ namespace errors = manifest_errors;
|
| namespace {
|
|
|
| bool LoadImages(const base::DictionaryValue* theme_value,
|
| - string16* error,
|
| + base::string16* error,
|
| ThemeInfo* theme_info) {
|
| const base::DictionaryValue* images_value = NULL;
|
| if (theme_value->GetDictionary(keys::kThemeImages, &images_value)) {
|
| @@ -56,7 +56,7 @@ bool LoadImages(const base::DictionaryValue* theme_value,
|
| }
|
|
|
| bool LoadColors(const base::DictionaryValue* theme_value,
|
| - string16* error,
|
| + base::string16* error,
|
| ThemeInfo* theme_info) {
|
| const base::DictionaryValue* colors_value = NULL;
|
| if (theme_value->GetDictionary(keys::kThemeColors, &colors_value)) {
|
| @@ -88,7 +88,7 @@ bool LoadColors(const base::DictionaryValue* theme_value,
|
| }
|
|
|
| bool LoadTints(const base::DictionaryValue* theme_value,
|
| - string16* error,
|
| + base::string16* error,
|
| ThemeInfo* theme_info) {
|
| const base::DictionaryValue* tints_value = NULL;
|
| if (!theme_value->GetDictionary(keys::kThemeTints, &tints_value))
|
| @@ -113,7 +113,7 @@ bool LoadTints(const base::DictionaryValue* theme_value,
|
| }
|
|
|
| bool LoadDisplayProperties(const base::DictionaryValue* theme_value,
|
| - string16* error,
|
| + base::string16* error,
|
| ThemeInfo* theme_info) {
|
| const base::DictionaryValue* display_properties_value = NULL;
|
| if (theme_value->GetDictionary(keys::kThemeDisplayProperties,
|
| @@ -167,7 +167,7 @@ ThemeHandler::ThemeHandler() {
|
| ThemeHandler::~ThemeHandler() {
|
| }
|
|
|
| -bool ThemeHandler::Parse(Extension* extension, string16* error) {
|
| +bool ThemeHandler::Parse(Extension* extension, base::string16* error) {
|
| const base::DictionaryValue* theme_value = NULL;
|
| if (!extension->manifest()->GetDictionary(keys::kTheme, &theme_value)) {
|
| *error = ASCIIToUTF16(errors::kInvalidTheme);
|
|
|