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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/exo/shell_surface.cc

Issue 2780623002: exo: Fix multi-display hardware cursor (Closed)
Patch Set: Rebase properly Created 3 years, 9 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
« components/exo/pointer.cc ('K') | « components/exo/pointer.cc ('k') | components/exo/wm_helper.h » ('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 b8cc45523ad2b37aed9427d44e7269eec7e34af0..5fc242988233f447b8b5a439605309e9784dac67 100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc
@@ -1152,8 +1152,9 @@ void ShellSurface::CreateShellSurfaceWidget(ui::WindowShowState show_state) {
params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
params.show_state = show_state;
// Make shell surface a transient child if |parent_| has been set.
- params.parent =
- parent_ ? parent_ : WMHelper::GetInstance()->GetContainer(container_);
+ params.parent = parent_ ? parent_
reveman 2017/03/30 07:47:53 how is this change related?
Dominik Laskowski 2017/04/05 17:59:25 GetContainer gained a parameter.
+ : WMHelper::GetInstance()->GetContainer(
+ primary_display_id_, container_);
params.bounds = gfx::Rect(origin_, gfx::Size());
bool activatable = activatable_;
// ShellSurfaces in system modal container are only activatable if input
« components/exo/pointer.cc ('K') | « components/exo/pointer.cc ('k') | components/exo/wm_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698