Move default_locale out of Extension class

chrome/common/extensions/extension.cc

 // Copyright (c) 2013 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.h"
 
 #include <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 1904 matching lines @@
 bool Extension::LoadSharedFeatures(
     const APIPermissionSet& api_permissions,
     string16* error) {
   if (!LoadDescription(error) ||
       !LoadIcons(error) ||
       !LoadCommands(error) ||
       !LoadPlugins(error) ||
       !LoadNaClModules(error) ||
       !LoadSandboxedPages(error) ||
       !LoadRequirements(error) ||
-      !LoadDefaultLocale(error) ||
       !LoadOfflineEnabled(error) ||
       // LoadBackgroundScripts() must be called before LoadBackgroundPage().
       !LoadBackgroundScripts(error) ||
       !LoadBackgroundPage(api_permissions, error) ||
       !LoadBackgroundPersistent(api_permissions, error) ||
       !LoadBackgroundAllowJSAccess(api_permissions, error) ||
       !LoadOAuth2Info(error))
     return false;
 
   return true;
@@ skipping 325 matching lines @@
         }
       }
     } else {
       *error = ASCIIToUTF16(errors::kInvalidRequirements);
       return false;
     }
   }
   return true;
 }
 
-bool Extension::LoadDefaultLocale(string16* error) {
-  if (!manifest_->HasKey(keys::kDefaultLocale))
-    return true;
-  if (!manifest_->GetString(keys::kDefaultLocale, &default_locale_) ||
-      !l10n_util::IsValidLocaleSyntax(default_locale_)) {
-    *error = ASCIIToUTF16(errors::kInvalidDefaultLocale);
-    return false;
-  }
-  return true;
-}
-
 bool Extension::LoadOfflineEnabled(string16* error) {
   // Defaults to false, except for platform apps which are offline by default.
   if (!manifest_->HasKey(keys::kOfflineEnabled)) {
     offline_enabled_ = is_platform_app();
     return true;
   }
   if (!manifest_->GetBoolean(keys::kOfflineEnabled, &offline_enabled_)) {
     *error = ASCIIToUTF16(errors::kInvalidOfflineEnabled);
     return false;
   }
@@ skipping 924 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions