Move default_locale out of Extension class

chrome/common/extensions/extension_file_util.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/common/extensions/extension_file_util.h"
 
 #include <map>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
+#include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/extensions/message_bundle.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/file_stream.h"
@@ skipping 522 matching lines @@
 
   return returnValue;
 }
 
 static bool ValidateLocaleInfo(const Extension& extension,
                                std::string* error) {
   // default_locale and _locales have to be both present or both missing.
   const FilePath path = extension.path().Append(
       Extension::kLocaleFolder);
   bool path_exists = file_util::PathExists(path);
-  std::string default_locale = extension.default_locale();
+  std::string default_locale =
+      extensions::LocaleInfo::GetDefaultLocale(&extension);

[Yoyo Zhou, 2013/01/22 20:15:56]

This validation is done in the utility process so you'll need to register the
handler in ChromeContentUtilityClient.

[Joe Thomas, 2013/01/23 20:01:08]

Done.

 
   // If both default locale and _locales folder are empty, skip verification.
   if (default_locale.empty() && !path_exists)
     return true;
 
   if (default_locale.empty() && path_exists) {
     *error = l10n_util::GetStringUTF8(
         IDS_EXTENSION_LOCALES_NO_DEFAULT_LOCALE_SPECIFIED);
     return false;
   } else if (!default_locale.empty() && !path_exists) {
@@ skipping 180 matching lines @@
     return FilePath();
   }
   return temp_path;
 }
 
 void DeleteFile(const FilePath& path, bool recursive) {
   file_util::Delete(path, recursive);
 }
 
 }  // namespace extension_file_util