ash/mus/bridge/wm_shell_mus.h - Issue 2215223004: mash: Migrate ShelfLayoutManager ScreenUtil usage to ash common types.

Side by Side Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2215223004: mash: Migrate ShelfLayoutManager ScreenUtil usage to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Restore screen bounds conversion for app list. Created 4 years, 4 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 | « ash/display/window_tree_host_manager_unittest.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('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 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_	5 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_

6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_	6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_

7	7

8 #include <stdint.h>	8 #include <stdint.h>

9	9

10 #include <memory>	10 #include <memory>

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 }	56 }

57	57

58 // WmShell:	58 // WmShell:

59 WmWindow* NewContainerWindow() override;	59 WmWindow* NewContainerWindow() override;

60 WmWindow* GetFocusedWindow() override;	60 WmWindow* GetFocusedWindow() override;

61 WmWindow* GetActiveWindow() override;	61 WmWindow* GetActiveWindow() override;

62 WmWindow* GetPrimaryRootWindow() override;	62 WmWindow* GetPrimaryRootWindow() override;

63 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;	63 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;

64 const DisplayInfo& GetDisplayInfo(int64_t display_id) const override;	64 const DisplayInfo& GetDisplayInfo(int64_t display_id) const override;

65 bool IsActiveDisplayId(int64_t display_id) const override;	65 bool IsActiveDisplayId(int64_t display_id) const override;

	66 display::Display GetFirstDisplay() const override;

	67 bool IsInUnifiedMode() const override;

66 bool IsForceMaximizeOnFirstRun() override;	68 bool IsForceMaximizeOnFirstRun() override;

67 bool IsPinned() override;	69 bool IsPinned() override;

68 void SetPinnedWindow(WmWindow* window) override;	70 void SetPinnedWindow(WmWindow* window) override;

69 bool CanShowWindowForUser(WmWindow* window) override;	71 bool CanShowWindowForUser(WmWindow* window) override;

70 void LockCursor() override;	72 void LockCursor() override;

71 void UnlockCursor() override;	73 void UnlockCursor() override;

72 std::vector<WmWindow*> GetAllRootWindows() override;	74 std::vector<WmWindow*> GetAllRootWindows() override;

73 void RecordUserMetricsAction(UserMetricsAction action) override;	75 void RecordUserMetricsAction(UserMetricsAction action) override;

74 void RecordTaskSwitchMetric(TaskSwitchSource source) override;	76 void RecordTaskSwitchMetric(TaskSwitchSource source) override;

75 void ShowContextMenu(const gfx::Point& location_in_screen,	77 void ShowContextMenu(const gfx::Point& location_in_screen,

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
122	124

123 base::ObserverList<WmActivationObserver> activation_observers_;	125 base::ObserverList<WmActivationObserver> activation_observers_;

124	126

125 DISALLOW_COPY_AND_ASSIGN(WmShellMus);	127 DISALLOW_COPY_AND_ASSIGN(WmShellMus);

126 };	128 };

127	129

128 } // namespace mus	130 } // namespace mus

129 } // namespace ash	131 } // namespace ash

130	132

131 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_	133 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_

OLD	NEW