components/exo/shell_surface.cc - Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: components/exo/shell_surface.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)

Patch Set: rebase Created 4 years, 2 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 unified diff | 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 »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "components/exo/shell_surface.h"	5 #include "components/exo/shell_surface.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "ash/aura/wm_window_aura.h"	9 #include "ash/aura/wm_window_aura.h"

10 #include "ash/common/shelf/wm_shelf.h"	10 #include "ash/common/shelf/wm_shelf.h"

11 #include "ash/common/shell_window_ids.h"

12 #include "ash/common/wm/window_resizer.h"	11 #include "ash/common/wm/window_resizer.h"

13 #include "ash/common/wm/window_state.h"	12 #include "ash/common/wm/window_state.h"

14 #include "ash/common/wm/window_state_delegate.h"	13 #include "ash/common/wm/window_state_delegate.h"

15 #include "ash/common/wm_shell.h"	14 #include "ash/common/wm_shell.h"

	15 #include "ash/public/cpp/shell_window_ids.h"

16 #include "ash/wm/window_state_aura.h"	16 #include "ash/wm/window_state_aura.h"

17 #include "ash/wm/window_util.h"	17 #include "ash/wm/window_util.h"

18 #include "base/logging.h"	18 #include "base/logging.h"

19 #include "base/macros.h"	19 #include "base/macros.h"

20 #include "base/memory/ptr_util.h"	20 #include "base/memory/ptr_util.h"

21 #include "base/strings/utf_string_conversions.h"	21 #include "base/strings/utf_string_conversions.h"

22 #include "base/trace_event/trace_event.h"	22 #include "base/trace_event/trace_event.h"

23 #include "base/trace_event/trace_event_argument.h"	23 #include "base/trace_event/trace_event_argument.h"

24 #include "components/exo/surface.h"	24 #include "components/exo/surface.h"

25 #include "ui/aura/client/aura_constants.h"	25 #include "ui/aura/client/aura_constants.h"

(...skipping 1365 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1391 shadow_overlay_->layer()->Add(shadow->layer());	1391 shadow_overlay_->layer()->Add(shadow->layer());

1392 window->AddChild(shadow_overlay_);	1392 window->AddChild(shadow_overlay_);

1393 shadow_overlay_->Show();	1393 shadow_overlay_->Show();

1394 }	1394 }

1395 shadow_overlay_->SetBounds(shadow_bounds);	1395 shadow_overlay_->SetBounds(shadow_bounds);

1396 shadow->SetContentBounds(gfx::Rect(shadow_bounds.size()));	1396 shadow->SetContentBounds(gfx::Rect(shadow_bounds.size()));

1397 }	1397 }

1398 }	1398 }

1399	1399

1400 } // namespace exo	1400 } // namespace exo

OLD	NEW