Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: components/exo/wayland/server.cc

Issue 2480713003: Window prerequisites for ShelfWindowWatcher panel support. (Closed)
Patch Set: Fix ShellSurface KAppIdKey use; remove local application_id_. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/exo/wayland/server.cc
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index 7b3d47ed80040647c1ddc52cbfadf1d94d6f513a..75f0db687bbc266163b49a5441cf60ef4f78d4b2 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc
@@ -967,7 +967,8 @@ void shell_surface_set_title(wl_client* client,
void shell_surface_set_class(wl_client* client,
wl_resource* resource,
const char* clazz) {
- GetUserDataAs<ShellSurface>(resource)->SetApplicationId(clazz);
+ views::Widget* widget = GetUserDataAs<ShellSurface>(resource)->GetWidget();
+ ShellSurface::SetApplicationId(widget->GetNativeWindow(), clazz);
}
const struct wl_shell_surface_interface shell_surface_implementation = {
@@ -1176,7 +1177,8 @@ void xdg_surface_set_title(wl_client* client,
void xdg_surface_set_add_id(wl_client* client,
wl_resource* resource,
const char* app_id) {
- GetUserDataAs<ShellSurface>(resource)->SetApplicationId(app_id);
+ views::Widget* widget = GetUserDataAs<ShellSurface>(resource)->GetWidget();
+ ShellSurface::SetApplicationId(widget->GetNativeWindow(), app_id);
}
void xdg_surface_show_window_menu(wl_client* client,
@@ -1440,7 +1442,8 @@ void remote_surface_destroy(wl_client* client, wl_resource* resource) {
void remote_surface_set_app_id(wl_client* client,
wl_resource* resource,
const char* app_id) {
- GetUserDataAs<ShellSurface>(resource)->SetApplicationId(app_id);
+ views::Widget* widget = GetUserDataAs<ShellSurface>(resource)->GetWidget();
+ ShellSurface::SetApplicationId(widget->GetNativeWindow(), app_id);
}
void remote_surface_set_window_geometry(wl_client* client,

Powered by Google App Engine
This is Rietveld 408576698