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

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: build 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
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 return accelerator_controller_delegate_.get(); 60 return accelerator_controller_delegate_.get();
61 } 61 }
62 62
63 // WmShell: 63 // WmShell:
64 WmWindow* NewContainerWindow() override; 64 WmWindow* NewContainerWindow() override;
65 WmWindow* GetFocusedWindow() override; 65 WmWindow* GetFocusedWindow() override;
66 WmWindow* GetActiveWindow() override; 66 WmWindow* GetActiveWindow() override;
67 WmWindow* GetCaptureWindow() override; 67 WmWindow* GetCaptureWindow() override;
68 WmWindow* GetPrimaryRootWindow() override; 68 WmWindow* GetPrimaryRootWindow() override;
69 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; 69 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
70 const DisplayInfo& GetDisplayInfo(int64_t display_id) const override; 70 const ui::ManagedDisplayInfo& GetDisplayInfo(
71 int64_t display_id) const override;
71 bool IsActiveDisplayId(int64_t display_id) const override; 72 bool IsActiveDisplayId(int64_t display_id) const override;
72 display::Display GetFirstDisplay() const override; 73 display::Display GetFirstDisplay() const override;
73 bool IsInUnifiedMode() const override; 74 bool IsInUnifiedMode() const override;
74 bool IsForceMaximizeOnFirstRun() override; 75 bool IsForceMaximizeOnFirstRun() override;
75 void SetDisplayWorkAreaInsets(WmWindow* window, 76 void SetDisplayWorkAreaInsets(WmWindow* window,
76 const gfx::Insets& insets) override; 77 const gfx::Insets& insets) override;
77 bool IsPinned() override; 78 bool IsPinned() override;
78 void SetPinnedWindow(WmWindow* window) override; 79 void SetPinnedWindow(WmWindow* window) override;
79 bool CanShowWindowForUser(WmWindow* window) override; 80 bool CanShowWindowForUser(WmWindow* window) override;
80 void LockCursor() override; 81 void LockCursor() override;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 140
140 base::ObserverList<WmActivationObserver> activation_observers_; 141 base::ObserverList<WmActivationObserver> activation_observers_;
141 142
142 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 143 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
143 }; 144 };
144 145
145 } // namespace mus 146 } // namespace mus
146 } // namespace ash 147 } // namespace ash
147 148
148 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 149 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698