mash/wm/bridge/wm_window_mus.cc - Issue 1965073002: Rename gfx::Display to display::Display

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: mash/wm/bridge/wm_window_mus.cc

Issue 1965073002: Rename gfx::Display to display::Display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 7 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 | « mash/wm/bridge/wm_root_window_controller_mus.cc ('k') | mash/wm/root_window_controller.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 "mash/wm/bridge/wm_window_mus.h"	5 #include "mash/wm/bridge/wm_window_mus.h"

6	6

7 #include "ash/wm/common/container_finder.h"	7 #include "ash/wm/common/container_finder.h"

8 #include "ash/wm/common/window_state.h"	8 #include "ash/wm/common/window_state.h"

9 #include "ash/wm/common/wm_layout_manager.h"	9 #include "ash/wm/common/wm_layout_manager.h"

10 #include "ash/wm/common/wm_window_observer.h"	10 #include "ash/wm/common/wm_window_observer.h"

11 #include "ash/wm/common/wm_window_property.h"	11 #include "ash/wm/common/wm_window_property.h"

12 #include "components/mus/public/cpp/window.h"	12 #include "components/mus/public/cpp/window.h"

13 #include "components/mus/public/cpp/window_property.h"	13 #include "components/mus/public/cpp/window_property.h"

14 #include "components/mus/public/cpp/window_tree_connection.h"	14 #include "components/mus/public/cpp/window_tree_connection.h"

15 #include "mash/wm/bridge/mus_layout_manager_adapter.h"	15 #include "mash/wm/bridge/mus_layout_manager_adapter.h"

16 #include "mash/wm/bridge/wm_globals_mus.h"	16 #include "mash/wm/bridge/wm_globals_mus.h"

17 #include "mash/wm/bridge/wm_root_window_controller_mus.h"	17 #include "mash/wm/bridge/wm_root_window_controller_mus.h"

18 #include "mash/wm/property_util.h"	18 #include "mash/wm/property_util.h"

19 #include "ui/aura/mus/mus_util.h"	19 #include "ui/aura/mus/mus_util.h"

20 #include "ui/base/hit_test.h"	20 #include "ui/base/hit_test.h"

21 #include "ui/gfx/display.h"	21 #include "ui/display/display.h"

22 #include "ui/views/widget/widget.h"	22 #include "ui/views/widget/widget.h"

23 #include "ui/views/widget/widget_delegate.h"	23 #include "ui/views/widget/widget_delegate.h"

24	24

25 MUS_DECLARE_WINDOW_PROPERTY_TYPE(mash::wm::WmWindowMus*);	25 MUS_DECLARE_WINDOW_PROPERTY_TYPE(mash::wm::WmWindowMus*);

26	26

27 namespace mash {	27 namespace mash {

28 namespace wm {	28 namespace wm {

29	29

30 MUS_DEFINE_OWNED_WINDOW_PROPERTY_KEY(mash::wm::WmWindowMus,	30 MUS_DEFINE_OWNED_WINDOW_PROPERTY_KEY(mash::wm::WmWindowMus,

31 kWmWindowKey,	31 kWmWindowKey,

(...skipping 561 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
593 OnWindowBoundsChanged(this, old_bounds, new_bounds));	593 OnWindowBoundsChanged(this, old_bounds, new_bounds));

594 }	594 }

595	595

596 void WmWindowMus::OnWindowDestroying(mus::Window* window) {	596 void WmWindowMus::OnWindowDestroying(mus::Window* window) {

597 FOR_EACH_OBSERVER(ash::wm::WmWindowObserver, observers_,	597 FOR_EACH_OBSERVER(ash::wm::WmWindowObserver, observers_,

598 OnWindowDestroying(this));	598 OnWindowDestroying(this));

599 }	599 }

600	600

601 } // namespace wm	601 } // namespace wm

602 } // namespace mash	602 } // namespace mash

OLD	NEW