linux: fix a notimplemented by sharing mac code

We don't have an install-time language setting either.

Review URL: http://codereview.chromium.org/208054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26786 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 3 insertions, 16 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 97b589a..2b048a9 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -386,16 +386,15 @@ int BrowserMain(const MainFunctionParams& parameters) {
 
 
   if (is_first_run) {
-#if !defined(OS_MACOSX)
+#if defined(OS_WIN)
     // During first run we read the google_update registry key to find what
     // language the user selected when downloading the installer. This
     // becomes our default language in the prefs.
-    // Mac doesn't need this because it is always using language that Cocoa
-    // selected from the user's language list (in System Preferences).
+    // Other platforms obey the system locale.
     std::wstring install_lang;
     if (GoogleUpdateSettings::GetLanguage(&install_lang))
       local_state->SetString(prefs::kApplicationLocale, install_lang);
-#endif  // defined(OS_MACOSX)
+#endif  // defined(OS_WIN)
     if (GoogleUpdateSettings::GetCollectStatsConsent())
       local_state->SetBoolean(prefs::kMetricsReportingEnabled, true);
   }
diff --git a/chrome/browser/google_update_settings_mac.mm b/chrome/browser/google_update_settings_mac.mm
index d69709f..61cb987 100644
--- a/chrome/browser/google_update_settings_mac.mm
+++ b/chrome/browser/google_update_settings_mac.mm
@@ -18,12 +18,6 @@ bool GoogleUpdateSettings::GetBrowser(std::wstring* browser) {
 }
 
 // static
-bool GoogleUpdateSettings::GetLanguage(std::wstring* language) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-// static
 bool GoogleUpdateSettings::GetBrand(std::wstring* brand) {
   NOTIMPLEMENTED();
   return false;
diff --git a/chrome/browser/google_update_settings_posix.cc b/chrome/browser/google_update_settings_posix.cc
index fd38372..b9c5f85 100644
--- a/chrome/browser/google_update_settings_posix.cc
+++ b/chrome/browser/google_update_settings_posix.cc
@@ -67,9 +67,3 @@ bool GoogleUpdateSettings::SetCollectStatsConsent(bool consented) {
     return file_util::Delete(consent_file, false);
   }
 }
-
-// static
-bool GoogleUpdateSettings::GetLanguage(std::wstring* language) {
-  NOTIMPLEMENTED();
-  return false;
-}