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

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

Issue 2270553002: Move ash::DisplayInfo to ui (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 unified diff | Download patch
« no previous file with comments | « ash/host/ash_window_tree_host_unified.h ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 return accelerator_controller_delegate_.get(); 61 return accelerator_controller_delegate_.get();
62 } 62 }
63 63
64 // WmShell: 64 // WmShell:
65 WmWindow* NewContainerWindow() override; 65 WmWindow* NewContainerWindow() override;
66 WmWindow* GetFocusedWindow() override; 66 WmWindow* GetFocusedWindow() override;
67 WmWindow* GetActiveWindow() override; 67 WmWindow* GetActiveWindow() override;
68 WmWindow* GetCaptureWindow() override; 68 WmWindow* GetCaptureWindow() override;
69 WmWindow* GetPrimaryRootWindow() override; 69 WmWindow* GetPrimaryRootWindow() override;
70 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; 70 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
71 const DisplayInfo& GetDisplayInfo(int64_t display_id) const override; 71 const display::ManagedDisplayInfo& GetDisplayInfo(
72 int64_t display_id) const override;
72 bool IsActiveDisplayId(int64_t display_id) const override; 73 bool IsActiveDisplayId(int64_t display_id) const override;
73 display::Display GetFirstDisplay() const override; 74 display::Display GetFirstDisplay() const override;
74 bool IsInUnifiedMode() const override; 75 bool IsInUnifiedMode() const override;
75 bool IsForceMaximizeOnFirstRun() override; 76 bool IsForceMaximizeOnFirstRun() override;
76 void SetDisplayWorkAreaInsets(WmWindow* window, 77 void SetDisplayWorkAreaInsets(WmWindow* window,
77 const gfx::Insets& insets) override; 78 const gfx::Insets& insets) override;
78 bool IsPinned() override; 79 bool IsPinned() override;
79 void SetPinnedWindow(WmWindow* window) override; 80 void SetPinnedWindow(WmWindow* window) override;
80 bool CanShowWindowForUser(WmWindow* window) override; 81 bool CanShowWindowForUser(WmWindow* window) override;
81 void LockCursor() override; 82 void LockCursor() override;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 144
144 base::ObserverList<WmActivationObserver> activation_observers_; 145 base::ObserverList<WmActivationObserver> activation_observers_;
145 146
146 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 147 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
147 }; 148 };
148 149
149 } // namespace mus 150 } // namespace mus
150 } // namespace ash 151 } // namespace ash
151 152
152 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 153 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/host/ash_window_tree_host_unified.h ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698