Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / preference / chrome_direct_setting_api.cc

diff --git a/src/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc b/src/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
index d122cfe..fe1325a 100644 (file)
--- a/src/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
+++ b/src/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
@@ -25,6 +25,11 @@ class PreferenceWhitelist {
  public:
   PreferenceWhitelist() {
     whitelist_.insert("googlegeolocationaccess.enabled");
+    whitelist_.insert("spdy_proxy.enabled");
+    whitelist_.insert("data_reduction.daily_original_length");
+    whitelist_.insert("data_reduction.daily_received_length");
+    whitelist_.insert("data_reduction.update_daily_lengths");
+    whitelist_.insert("easy_unlock.proximity_required");
   }
 
   ~PreferenceWhitelist() {}
@@ -42,9 +47,7 @@ class PreferenceWhitelist {
       std::string event_name = base::StringPrintf(
           kOnPrefChangeFormat,
           (*iter).c_str());
-      ExtensionSystem::Get(profile)->event_router()->RegisterObserver(
-          observer,
-          event_name);
+      EventRouter::Get(profile)->RegisterObserver(observer, event_name);
     }
   }
 
@@ -94,7 +97,7 @@ ChromeDirectSettingAPI::GetFactoryInstance() {
 
 // EventRouter::Observer implementation.
 void ChromeDirectSettingAPI::OnListenerAdded(const EventListenerInfo& details) {
-  ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);
+  EventRouter::Get(profile_)->UnregisterObserver(this);
   registrar_.Init(profile_->GetPrefs());
   preference_whitelist.Get().RegisterPropertyListeners(
       profile_,
@@ -123,7 +126,7 @@ void ChromeDirectSettingAPI::OnPrefChanged(
     PrefService* pref_service, const std::string& pref_key) {
   std::string event_name = base::StringPrintf(kOnPrefChangeFormat,
                                               pref_key.c_str());
-  EventRouter* router = ExtensionSystem::Get(profile_)->event_router();
+  EventRouter* router = EventRouter::Get(profile_);
   if (router && router->HasEventListener(event_name)) {
     const PrefService::Preference* preference =
         profile_->GetPrefs()->FindPreference(pref_key.c_str());
@@ -139,13 +142,11 @@ void ChromeDirectSettingAPI::OnPrefChanged(
     const ExtensionSet* extensions = extension_service->extensions();
     for (ExtensionSet::const_iterator it = extensions->begin();
          it != extensions->end(); ++it) {
-      if ((*it)->location() == Manifest::COMPONENT) {
-        std::string extension_id = (*it)->id();
-        if (router->ExtensionHasEventListener(extension_id, event_name)) {
-          scoped_ptr<base::ListValue> args_copy(args.DeepCopy());
-          scoped_ptr<Event> event(new Event(event_name, args_copy.Pass()));
-          router->DispatchEventToExtension(extension_id, event.Pass());
-        }
+      const std::string& extension_id = (*it)->id();
+      if (router->ExtensionHasEventListener(extension_id, event_name)) {
+        scoped_ptr<base::ListValue> args_copy(args.DeepCopy());
+        scoped_ptr<Event> event(new Event(event_name, args_copy.Pass()));
+        router->DispatchEventToExtension(extension_id, event.Pass());
       }
     }
   }