diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
| commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
| tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebKit2/UIProcess/WebContext.cpp | |
| parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
| download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz | |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebKit2/UIProcess/WebContext.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebContext.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp index 18bca116a..23ca56be6 100644 --- a/Source/WebKit2/UIProcess/WebContext.cpp +++ b/Source/WebKit2/UIProcess/WebContext.cpp @@ -31,7 +31,6 @@ #include "InjectedBundleMessageKinds.h" #include "Logging.h" #include "MutableDictionary.h" -#include "RunLoop.h" #include "SandboxExtension.h" #include "StatisticsData.h" #include "TextChecker.h" @@ -58,6 +57,7 @@ #include <WebCore/LinkHash.h> #include <WebCore/Logging.h> #include <WebCore/ResourceRequest.h> +#include <WebCore/RunLoop.h> #include <runtime/InitializeThreading.h> #include <wtf/CurrentTime.h> #include <wtf/MainThread.h> @@ -231,7 +231,7 @@ void WebContext::languageChanged(void* context) void WebContext::languageChanged() { - sendToAllProcesses(Messages::WebProcess::LanguageChanged(defaultLanguage())); + sendToAllProcesses(Messages::WebProcess::UserPreferredLanguagesChanged(userPreferredLanguages())); } void WebContext::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled) @@ -255,7 +255,7 @@ void WebContext::ensureWebProcess() parameters.shouldTrackVisitedLinks = m_historyClient.shouldTrackVisitedLinks(); parameters.cacheModel = m_cacheModel; - parameters.languageCode = defaultLanguage(); + parameters.languages = userPreferredLanguages(); parameters.applicationCacheDirectory = applicationCacheDirectory(); parameters.databaseDirectory = databaseDirectory(); parameters.localStorageDirectory = localStorageDirectory(); @@ -281,6 +281,10 @@ void WebContext::ensureWebProcess() parameters.defaultRequestTimeoutInterval = WebURLRequest::defaultTimeoutInterval(); +#if ENABLE(NOTIFICATIONS) + m_notificationManagerProxy->populateCopyOfNotificationPermissions(parameters.notificationPermissions); +#endif + // Add any platform specific parameters platformInitializeWebProcess(parameters); |