Use new glibmm 2.78 API

This commit is contained in:
Ilya Fedin 2023-05-20 18:23:27 +04:00 committed by John Preston
parent 3e7f1250c5
commit da7f4fe425

View file

@ -6,13 +6,14 @@
// //
#include "ui/platform/linux/ui_window_title_linux.h" #include "ui/platform/linux/ui_window_title_linux.h"
#include "base/platform/linux/base_linux_glibmm_helper.h"
#include "base/platform/linux/base_linux_xdp_utilities.h" #include "base/platform/linux/base_linux_xdp_utilities.h"
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
#include "base/platform/linux/base_linux_xsettings.h" #include "base/platform/linux/base_linux_xsettings.h"
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
#include <glibmm.h>
namespace Ui { namespace Ui {
namespace Platform { namespace Platform {
namespace internal { namespace internal {
@ -120,8 +121,7 @@ TitleControls::Layout TitleControlsLayout() {
return GtkKeywordsToTitleControlsLayout( return GtkKeywordsToTitleControlsLayout(
QString::fromStdString( QString::fromStdString(
base::Platform::GlibVariantCast<Glib::ustring>( decorationLayout->get_dynamic<Glib::ustring>()));
*decorationLayout)));
} catch (...) { } catch (...) {
} }