Merge lp:~zaspire/oxide/navigator-language into lp:~oxide-developers/oxide/oxide.trunk

[Maxim Ermilov]

[Chris Coulson (chrisccoulson)]

Thanks, this looks fine.

I believe there might also be a second bug - in oxide::ContentMainDelegate::PreSandboxStartup we call ui::ResourceBundle::InitSharedInstanceWithLocale with an empty locale to rely on Chromium to select the correct locale (and load the right resource file, which is needed to get the correct Accept-Language header). But this only works when Chromium is built with the glib bits turned on, which I don't think we do anymore. If that's the case, we also need to pass the application locale to InitSharedInstanceWithLocale (it would mean adding a second method - PlatformDelegate::GetApplicationLocale - in addition to the one added in this merge).

Would you mind taking a look at that too?

review: Approve

[Maxim Ermilov (zaspire)]

> Would you mind taking a look at that too?

I will look at it

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.cc'
--- qt/core/browser/oxide_qt_browser_platform_integration.cc	2015-01-16 23:04:18 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.cc	2015-03-18 08:27:26 +0000
@@ -140,6 +140,11 @@
   }
 }
 
+std::string
+BrowserPlatformIntegration::GetApplicationLocale() {
+  return QLocale::system().name().toStdString();
+}
+
 QThread* GetIOQThread() {
   return g_io_thread.Get();
 }

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.h'
--- qt/core/browser/oxide_qt_browser_platform_integration.h	2014-11-14 14:36:14 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.h	2015-03-18 08:27:26 +0000
@@ -56,6 +56,7 @@
   void BrowserThreadInit(content::BrowserThread::ID id) final;
   content::LocationProvider* CreateLocationProvider() final;
   ApplicationState GetApplicationState() final;
+  std::string GetApplicationLocale() final;
 
   scoped_refptr<GLContextAdopted> gl_share_context_;
 

=== modified file 'shared/browser/oxide_browser_platform_integration.h'
--- shared/browser/oxide_browser_platform_integration.h	2014-11-14 14:31:59 +0000
+++ shared/browser/oxide_browser_platform_integration.h	2015-03-18 08:27:26 +0000
@@ -71,6 +71,8 @@
 
   virtual ApplicationState GetApplicationState();
 
+  virtual std::string GetApplicationLocale() = 0;
+
  protected:
   BrowserPlatformIntegration();
 

=== modified file 'shared/browser/oxide_content_browser_client.cc'
--- shared/browser/oxide_content_browser_client.cc	2015-03-05 11:39:38 +0000
+++ shared/browser/oxide_content_browser_client.cc	2015-03-18 08:27:26 +0000
@@ -388,4 +388,9 @@
   return gpu::GpuControlList::kOsAndroid;
 }
 
+std::string
+ContentBrowserClient::GetApplicationLocale() {
+  return platform_integration_->GetApplicationLocale();
+}
+
 } // namespace oxide

=== modified file 'shared/browser/oxide_content_browser_client.h'
--- shared/browser/oxide_content_browser_client.h	2015-03-05 11:39:38 +0000
+++ shared/browser/oxide_content_browser_client.h	2015-03-18 08:27:26 +0000
@@ -55,6 +55,7 @@
   void SetPlatformIntegration(BrowserPlatformIntegration* integration);
 
   // content::ContentBrowserClient implementation
+  std::string GetApplicationLocale() final;
   content::BrowserMainParts* CreateBrowserMainParts(
       const content::MainFunctionParams& parameters) final;
   void RenderProcessWillLaunch(content::RenderProcessHost* host) final;