Commit bfa52399 authored by Santosh Mahto's avatar Santosh Mahto

Adjust patch.

parent 346b47d5
......@@ -27,10 +27,10 @@ index 0eae3470e1bb..b8e698f04154 100644
}
declare_args() {
diff --git ui/ozone/platform/wayland/wayland_window.cc ui/ozone/platform/wayland/wayland_window.cc
diff --git ui/ozone/platform/wayland/host/wayland_window.cc ui/ozone/platform/wayland/host/wayland_window.cc
index 98fe563504b4..4c34e046db2a 100644
--- ui/ozone/platform/wayland/wayland_window.cc
+++ ui/ozone/platform/wayland/wayland_window.cc
--- ui/ozone/platform/wayland/host/wayland_window.cc
+++ ui/ozone/platform/wayland/host/wayland_window.cc
@@ -88,7 +88,8 @@ WaylandWindow::WaylandWindow(PlatformWindowDelegate* delegate,
connection_(connection),
xdg_shell_objects_factory_(new XDGShellObjectFactory()),
......@@ -54,10 +54,10 @@ index 98fe563504b4..4c34e046db2a 100644
+#endif
+
} // namespace ui
diff --git ui/ozone/platform/wayland/wayland_window.h ui/ozone/platform/wayland/wayland_window.h
diff --git ui/ozone/platform/wayland/host/wayland_window.h ui/ozone/platform/wayland/host/wayland_window.h
index 94c3a60c0e96..1d79aea32f3f 100644
--- ui/ozone/platform/wayland/wayland_window.h
+++ ui/ozone/platform/wayland/wayland_window.h
--- ui/ozone/platform/wayland/host/wayland_window.h
+++ ui/ozone/platform/wayland/host/wayland_window.h
@@ -125,6 +125,10 @@ class WaylandWindow : public PlatformWindow,
void SetRestoredBoundsInPixels(const gfx::Rect& bounds) override;
gfx::Rect GetRestoredBoundsInPixels() const override;
......@@ -77,10 +77,10 @@ index 94c3a60c0e96..1d79aea32f3f 100644
DISALLOW_COPY_AND_ASSIGN(WaylandWindow);
};
diff --git ui/ozone/platform/wayland/xdg_surface_wrapper.h ui/ozone/platform/wayland/xdg_surface_wrapper.h
diff --git ui/ozone/platform/wayland/host/xdg_surface_wrapper.h ui/ozone/platform/wayland/host/xdg_surface_wrapper.h
index 58bf12938b24..d35b82dba63d 100644
--- ui/ozone/platform/wayland/xdg_surface_wrapper.h
+++ ui/ozone/platform/wayland/xdg_surface_wrapper.h
--- ui/ozone/platform/wayland/host/xdg_surface_wrapper.h
+++ ui/ozone/platform/wayland/host/xdg_surface_wrapper.h
@@ -59,6 +59,10 @@ class XDGSurfaceWrapper {
// Sets a desired window geometry once wayland requests client to do so.
......@@ -92,10 +92,10 @@ index 58bf12938b24..d35b82dba63d 100644
};
bool CheckIfWlArrayHasValue(struct wl_array* wl_array, uint32_t value);
diff --git ui/ozone/platform/wayland/xdg_surface_wrapper_v5.cc ui/ozone/platform/wayland/xdg_surface_wrapper_v5.cc
diff --git ui/ozone/platform/wayland/host/xdg_surface_wrapper_v5.cc ui/ozone/platform/wayland/host/xdg_surface_wrapper_v5.cc
index 7f9cdf85ad25..203865b724f9 100644
--- ui/ozone/platform/wayland/xdg_surface_wrapper_v5.cc
+++ ui/ozone/platform/wayland/xdg_surface_wrapper_v5.cc
--- ui/ozone/platform/wayland/host/xdg_surface_wrapper_v5.cc
+++ ui/ozone/platform/wayland/host/xdg_surface_wrapper_v5.cc
@@ -6,6 +6,7 @@
#include <xdg-shell-unstable-v5-client-protocol.h>
......@@ -103,7 +103,7 @@ index 7f9cdf85ad25..203865b724f9 100644
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/base/hit_test.h"
#include "ui/ozone/platform/wayland/wayland_connection.h"
#include "ui/ozone/platform/wayland/host/wayland_connection.h"
@@ -79,6 +80,15 @@ void XDGSurfaceWrapperV5::SetWindowGeometry(const gfx::Rect& bounds) {
bounds.width(), bounds.height());
}
......@@ -120,10 +120,10 @@ index 7f9cdf85ad25..203865b724f9 100644
// static
void XDGSurfaceWrapperV5::Configure(void* data,
xdg_surface* obj,
diff --git ui/ozone/platform/wayland/xdg_surface_wrapper_v5.h ui/ozone/platform/wayland/xdg_surface_wrapper_v5.h
diff --git ui/ozone/platform/wayland/host/xdg_surface_wrapper_v5.h ui/ozone/platform/wayland/host/xdg_surface_wrapper_v5.h
index 5ef0e607a4ed..cee2f30b8586 100644
--- ui/ozone/platform/wayland/xdg_surface_wrapper_v5.h
+++ ui/ozone/platform/wayland/xdg_surface_wrapper_v5.h
--- ui/ozone/platform/wayland/host/xdg_surface_wrapper_v5.h
+++ ui/ozone/platform/wayland/host/xdg_surface_wrapper_v5.h
@@ -35,6 +35,10 @@ class XDGSurfaceWrapperV5 : public XDGSurfaceWrapper {
void SetTitle(const base::string16& title) override;
void AckConfigure() override;
......@@ -135,10 +135,10 @@ index 5ef0e607a4ed..cee2f30b8586 100644
// xdg_surface_listener
static void Configure(void* data,
diff --git ui/ozone/platform/wayland/xdg_surface_wrapper_v6.cc ui/ozone/platform/wayland/xdg_surface_wrapper_v6.cc
diff --git ui/ozone/platform/wayland/host/xdg_surface_wrapper_v6.cc ui/ozone/platform/wayland/host/xdg_surface_wrapper_v6.cc
index f913d208b637..f7a7f2354b8b 100644
--- ui/ozone/platform/wayland/xdg_surface_wrapper_v6.cc
+++ ui/ozone/platform/wayland/xdg_surface_wrapper_v6.cc
--- ui/ozone/platform/wayland/host/xdg_surface_wrapper_v6.cc
+++ ui/ozone/platform/wayland/host/xdg_surface_wrapper_v6.cc
@@ -6,6 +6,7 @@
#include <xdg-shell-unstable-v6-client-protocol.h>
......@@ -146,7 +146,7 @@ index f913d208b637..f7a7f2354b8b 100644
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/base/hit_test.h"
#include "ui/ozone/platform/wayland/wayland_connection.h"
#include "ui/ozone/platform/wayland/host/wayland_connection.h"
@@ -147,6 +148,16 @@ void XDGSurfaceWrapperV6::ConfigureTopLevel(
is_fullscreen, is_activated);
}
......@@ -164,10 +164,10 @@ index f913d208b637..f7a7f2354b8b 100644
// static
void XDGSurfaceWrapperV6::CloseTopLevel(
void* data,
diff --git ui/ozone/platform/wayland/xdg_surface_wrapper_v6.h ui/ozone/platform/wayland/xdg_surface_wrapper_v6.h
diff --git ui/ozone/platform/wayland/host/xdg_surface_wrapper_v6.h ui/ozone/platform/wayland/host/xdg_surface_wrapper_v6.h
index 92443cce94ce..ae15dbb91dff 100644
--- ui/ozone/platform/wayland/xdg_surface_wrapper_v6.h
+++ ui/ozone/platform/wayland/xdg_surface_wrapper_v6.h
--- ui/ozone/platform/wayland/host/xdg_surface_wrapper_v6.h
+++ ui/ozone/platform/wayland/host/xdg_surface_wrapper_v6.h
@@ -36,6 +36,9 @@ class XDGSurfaceWrapperV6 : public XDGSurfaceWrapper {
void SetTitle(const base::string16& title) override;
void AckConfigure() override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment