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

Side by Side Diff: ash/aura/wm_shell_aura.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/ash.gyp ('k') | ash/aura/wm_shell_aura.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_AURA_WM_SHELL_AURA_H_ 5 #ifndef ASH_AURA_WM_SHELL_AURA_H_
6 #define ASH_AURA_WM_SHELL_AURA_H_ 6 #define ASH_AURA_WM_SHELL_AURA_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 20 matching lines...) Expand all
31 void CreatePointerWatcherAdapter(); 31 void CreatePointerWatcherAdapter();
32 32
33 // WmShell: 33 // WmShell:
34 void Shutdown() override; 34 void Shutdown() override;
35 WmWindow* NewContainerWindow() override; 35 WmWindow* NewContainerWindow() override;
36 WmWindow* GetFocusedWindow() override; 36 WmWindow* GetFocusedWindow() override;
37 WmWindow* GetActiveWindow() override; 37 WmWindow* GetActiveWindow() override;
38 WmWindow* GetCaptureWindow() override; 38 WmWindow* GetCaptureWindow() override;
39 WmWindow* GetPrimaryRootWindow() override; 39 WmWindow* GetPrimaryRootWindow() override;
40 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; 40 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
41 const DisplayInfo& GetDisplayInfo(int64_t display_id) const override; 41 const display::ManagedDisplayInfo& GetDisplayInfo(
42 int64_t display_id) const override;
42 bool IsActiveDisplayId(int64_t display_id) const override; 43 bool IsActiveDisplayId(int64_t display_id) const override;
43 display::Display GetFirstDisplay() const override; 44 display::Display GetFirstDisplay() const override;
44 bool IsInUnifiedMode() const override; 45 bool IsInUnifiedMode() const override;
45 bool IsForceMaximizeOnFirstRun() override; 46 bool IsForceMaximizeOnFirstRun() override;
46 void SetDisplayWorkAreaInsets(WmWindow* window, 47 void SetDisplayWorkAreaInsets(WmWindow* window,
47 const gfx::Insets& insets) override; 48 const gfx::Insets& insets) override;
48 bool IsPinned() override; 49 bool IsPinned() override;
49 void SetPinnedWindow(WmWindow* window) override; 50 void SetPinnedWindow(WmWindow* window) override;
50 bool CanShowWindowForUser(WmWindow* window) override; 51 bool CanShowWindowForUser(WmWindow* window) override;
51 void LockCursor() override; 52 void LockCursor() override;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 106
106 bool added_display_observer_ = false; 107 bool added_display_observer_ = false;
107 base::ObserverList<WmDisplayObserver> display_observers_; 108 base::ObserverList<WmDisplayObserver> display_observers_;
108 109
109 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 110 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
110 }; 111 };
111 112
112 } // namespace ash 113 } // namespace ash
113 114
114 #endif // ASH_AURA_WM_SHELL_AURA_H_ 115 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698