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

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

Issue 2787363002: Moves couple of WmShell methods to standalone functions (Closed)
Patch Set: feedback and fix applist Created 3 years, 8 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 55 }
56 56
57 aura::WindowTreeClient* window_tree_client(); 57 aura::WindowTreeClient* window_tree_client();
58 58
59 WindowManager* window_manager() { return window_manager_; } 59 WindowManager* window_manager() { return window_manager_; }
60 60
61 // WmShell: 61 // WmShell:
62 void Shutdown() override; 62 void Shutdown() override;
63 bool IsRunningInMash() const override; 63 bool IsRunningInMash() const override;
64 Config GetConfig() const override; 64 Config GetConfig() const override;
65 WmWindow* GetFocusedWindow() override;
66 WmWindow* GetActiveWindow() override;
67 WmWindow* GetCaptureWindow() override;
68 WmWindow* GetPrimaryRootWindow() override; 65 WmWindow* GetPrimaryRootWindow() override;
69 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; 66 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
70 const display::ManagedDisplayInfo& GetDisplayInfo( 67 const display::ManagedDisplayInfo& GetDisplayInfo(
71 int64_t display_id) const override; 68 int64_t display_id) const override;
72 bool IsActiveDisplayId(int64_t display_id) const override; 69 bool IsActiveDisplayId(int64_t display_id) const override;
73 display::Display GetFirstDisplay() const override; 70 display::Display GetFirstDisplay() const override;
74 bool IsInUnifiedMode() const override; 71 bool IsInUnifiedMode() const override;
75 bool IsInUnifiedModeIgnoreMirroring() const override; 72 bool IsInUnifiedModeIgnoreMirroring() const override;
76 void SetDisplayWorkAreaInsets(WmWindow* window, 73 void SetDisplayWorkAreaInsets(WmWindow* window,
77 const gfx::Insets& insets) override; 74 const gfx::Insets& insets) override;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 144
148 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 145 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
149 146
150 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 147 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
151 }; 148 };
152 149
153 } // namespace mus 150 } // namespace mus
154 } // namespace ash 151 } // namespace ash
155 152
156 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 153 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_registrar.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698