Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 4 insertions, 28 deletions

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 2e1e0e2..12c1502 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -14,10 +14,8 @@
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/cros/touchpad_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profile.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "unicode/timezone.h"
@@ -25,11 +23,10 @@
 namespace chromeos {
 
 static const char kFallbackInputMethodLocale[] = "en-US";
-static const char kTalkAppExtensionId[] = "ggnioahjipcehijkhpdjekioddnjoben";
 
-Preferences::Preferences(Profile* profile)
-    : profile_(profile) {
-}
+Preferences::Preferences() {}
+
+Preferences::~Preferences() {}
 
 // static
 void Preferences::RegisterUserPrefs(PrefService* prefs) {
@@ -42,7 +39,6 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
   if (prefs->FindPreference(prefs::kAccessibilityEnabled) == NULL) {
     prefs->RegisterBooleanPref(prefs::kAccessibilityEnabled, false);
   }
-  prefs->RegisterIntegerPref(prefs::kLabsTalkEnabled, 1);
   prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity, 3);
   prefs->RegisterStringPref(prefs::kLanguageCurrentInputMethod, "");
   prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod, "");
@@ -185,8 +181,6 @@ void Preferences::Init(PrefService* prefs) {
   language_xkb_auto_repeat_interval_pref_.Init(
       prefs::kLanguageXkbAutoRepeatInterval, prefs, this);
 
-  labs_talk_enabled_.Init(prefs::kLabsTalkEnabled, prefs, this);
-
   enable_screen_lock_.Init(prefs::kEnableScreenLock, prefs, this);
 
   // Initialize touchpad settings to what's saved in user preferences.
@@ -346,11 +340,6 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) {
     UpdateAutoRepeatRate();
   }
 
-  // Listen for explicit changes as ExtensionsService handles startup case.
-  if (pref_name && *pref_name == prefs::kLabsTalkEnabled) {
-    UpdateTalkApp();
-  }
-
   // Init or update power manager config.
   if (!pref_name || *pref_name == prefs::kEnableScreenLock) {
     CrosLibrary::Get()->GetPowerLibrary()->EnableScreenLock(
@@ -404,7 +393,7 @@ void Preferences::SetLanguageConfigStringList(
 void Preferences::SetLanguageConfigStringListAsCSV(const char* section,
                                                    const char* name,
                                                    const std::string& value) {
-  LOG(INFO) << "Setting " << name << " to '" << value << "'";
+  VLOG(1) << "Setting " << name << " to '" << value << "'";
 
   std::vector<std::string> split_values;
   if (!value.empty())
@@ -446,17 +435,4 @@ void Preferences::UpdateAutoRepeatRate() {
   CrosLibrary::Get()->GetKeyboardLibrary()->SetAutoRepeatRate(rate);
 }
 
-void Preferences::UpdateTalkApp() {
-  if (!profile_->GetExtensionsService()->is_ready()) {
-    NOTREACHED() << "Extensions service should be ready";
-    return;
-  }
-
-  if (labs_talk_enabled_.GetValue() == 0) {
-    profile_->GetExtensionsService()->DisableExtension(kTalkAppExtensionId);
-  } else {
-    profile_->GetExtensionsService()->EnableExtension(kTalkAppExtensionId);
-  }
-}
-
 }  // namespace chromeos