X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fextensions%2Fapi%2Fpreference%2Fchrome_direct_setting_api.cc;h=49850f1fa2091df00226c24a5be2976ad61095f5;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=04b4307e7982b2d084b933f3942aaa966869b7f6;hpb=4b53d56b8a1db20d4089f6d4f37126d43f907125;p=platform%2Fframework%2Fweb%2Fcrosswalk.git 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 04b4307..49850f1 100644 --- a/src/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc +++ b/src/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc @@ -13,6 +13,7 @@ #include "chrome/browser/extensions/api/preference/preference_api_constants.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" +#include "extensions/browser/extension_system.h" namespace extensions { namespace chromedirectsetting { @@ -87,7 +88,7 @@ void ChromeDirectSettingAPI::Shutdown() {} // ProfileKeyedAPI implementation. ProfileKeyedAPIFactory* ChromeDirectSettingAPI::GetFactoryInstance() { - return &g_factory.Get(); + return g_factory.Pointer(); } // EventRouter::Observer implementation. @@ -127,7 +128,7 @@ void ChromeDirectSettingAPI::OnPrefChanged( profile_->GetPrefs()->FindPreference(pref_key.c_str()); const base::Value* value = preference->GetValue(); - scoped_ptr result(new DictionaryValue); + scoped_ptr result(new base::DictionaryValue); result->Set(preference_api_constants::kValue, value->DeepCopy()); base::ListValue args; args.Append(result.release()); @@ -151,4 +152,3 @@ void ChromeDirectSettingAPI::OnPrefChanged( } // namespace chromedirectsetting } // namespace extensions -