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

Unified Diff: components/exo/shell_surface.cc

Issue 2285633002: Add WM_EVENT_TRUSTED_PIN and WINDOW_STATE_TYPE_TRUSTED_PINNED to Ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 4 years, 3 months 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
« no previous file with comments | « components/exo/shell_surface.h ('k') | components/exo/shell_surface_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/shell_surface.cc
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
index 6248a27c13212c96588327d4db216d9844e79d12..941bdbc94689b47889aeb6ddaaf3bf13f0c68226 100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc
@@ -404,8 +404,9 @@ void ShellSurface::SetFullscreen(bool fullscreen) {
UpdateShelfStateForFullscreenChange(widget_);
}
-void ShellSurface::SetPinned(bool pinned) {
- TRACE_EVENT1("exo", "ShellSurface::SetPinned", "pinned", pinned);
+void ShellSurface::SetPinned(bool pinned, bool trusted) {
+ TRACE_EVENT2("exo", "ShellSurface::SetPinned", "pinned", pinned, "trusted",
+ trusted);
if (!widget_)
CreateShellSurfaceWidget(ui::SHOW_STATE_NORMAL);
@@ -414,7 +415,7 @@ void ShellSurface::SetPinned(bool pinned) {
// state doesn't change.
ScopedConfigure scoped_configure(this, true);
if (pinned) {
- ash::wm::PinWindow(widget_->GetNativeWindow());
+ ash::wm::PinWindow(widget_->GetNativeWindow(), trusted);
} else {
// At the moment, we cannot just unpin the window state, due to ash
// implementation. Instead, we call Restore() to unpin, if it is Pinned
« no previous file with comments | « components/exo/shell_surface.h ('k') | components/exo/shell_surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698