Change include for g_get_language_names from glib/gutils.h to glib.h.

Change include for g_get_language_names from glib/gutils.h to glib.h.

The function moved headers in newer glibs.
Also fix up the #ifs to be more focused.

Remove ui/base/OWNERS since it's identical to ui/OWNERS.
Add ui/base/l10n/OWNERS and put myself in it.

BUG=None


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=121141

[Evan Martin, 2012-02-08 22:04:23]

LGTM

what about TOOLKIT_USES_GTK?

https://chromiumcodereview.appspot.com/9360031/diff/1/ui/base/l10n/l10n_util.cc
File ui/base/l10n/l10n_util.cc (right):

https://chromiumcodereview.appspot.com/9360031/diff/1/ui/base/l10n/l10n_util....
ui/base/l10n/l10n_util.cc:9: #endif
I think officially conditional headers belong down below by the OS_WIN
conditional header too

[tony, 2012-02-08 22:06:29]

On 2012/02/08 22:04:23, Evan Martin wrote:
> LGTM
> 
> what about TOOLKIT_USES_GTK?

ChromiumOS explicitly doens't want this code (it was excluded by an earlier #if
defined(CHROMEOS)).

>
https://chromiumcodereview.appspot.com/9360031/diff/1/ui/base/l10n/l10n_util.cc
> File ui/base/l10n/l10n_util.cc (right):
> 
>
https://chromiumcodereview.appspot.com/9360031/diff/1/ui/base/l10n/l10n_util....
> ui/base/l10n/l10n_util.cc:9: #endif
> I think officially conditional headers belong down below by the OS_WIN
> conditional header too

Done.  Moved it above the OS_WIN conditional header.

[chfast, 2012-02-08 22:16:53]

On 2012/02/08 22:06:29, tony wrote:
> > ui/base/l10n/l10n_util.cc:9: #endif
> > I think officially conditional headers belong down below by the OS_WIN
> > conditional header too
> 
> Done.  Moved it above the OS_WIN conditional header.

Shouldn't it be in the #if - #elif form and in the order matching the order of
implementation?

Like:

#if defined(OS_WIN)
#include "ui/base/l10n/l10n_util_win.h"
#elif defined(TOOLKIT_GTK)
#include <glib.h>
#endif

[tony, 2012-02-08 22:18:56]

+sky for owners approval (also added myself to ui/base/l10n/OWNERS).

[sky, 2012-02-08 23:35:16]

LGTM

[commit-bot: I haz the power, 2012-02-08 23:37:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tony@chromium.org/9360031/6002

[commit-bot: I haz the power, 2012-02-09 01:50:14]

Change committed as 121141