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

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

Issue 2733303004: Removes WmShell::NewWindow() (Closed)
Patch Set: merge and feedback Created 3 years, 9 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/common/wm_window_user_data_unittest.cc ('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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 AcceleratorControllerDelegateMus* accelerator_controller_delegate() { 52 AcceleratorControllerDelegateMus* accelerator_controller_delegate() {
53 return accelerator_controller_delegate_.get(); 53 return accelerator_controller_delegate_.get();
54 } 54 }
55 55
56 aura::WindowTreeClient* window_tree_client(); 56 aura::WindowTreeClient* window_tree_client();
57 57
58 WindowManager* window_manager() { return window_manager_; } 58 WindowManager* window_manager() { return window_manager_; }
59 59
60 // WmShell: 60 // WmShell:
61 void Initialize(
62 const scoped_refptr<base::SequencedWorkerPool>& pool) override;
63 void Shutdown() override; 61 void Shutdown() override;
64 bool IsRunningInMash() const override; 62 bool IsRunningInMash() const override;
65 WmWindow* NewWindow(ui::wm::WindowType window_type,
66 ui::LayerType layer_type) override;
67 WmWindow* GetFocusedWindow() override; 63 WmWindow* GetFocusedWindow() override;
68 WmWindow* GetActiveWindow() override; 64 WmWindow* GetActiveWindow() override;
69 WmWindow* GetCaptureWindow() override; 65 WmWindow* GetCaptureWindow() override;
70 WmWindow* GetPrimaryRootWindow() override; 66 WmWindow* GetPrimaryRootWindow() override;
71 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; 67 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
72 const display::ManagedDisplayInfo& GetDisplayInfo( 68 const display::ManagedDisplayInfo& GetDisplayInfo(
73 int64_t display_id) const override; 69 int64_t display_id) const override;
74 bool IsActiveDisplayId(int64_t display_id) const override; 70 bool IsActiveDisplayId(int64_t display_id) const override;
75 display::Display GetFirstDisplay() const override; 71 display::Display GetFirstDisplay() const override;
76 bool IsInUnifiedMode() const override; 72 bool IsInUnifiedMode() const override;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 125 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
130 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 126 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
131 127
132 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 128 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
133 }; 129 };
134 130
135 } // namespace mus 131 } // namespace mus
136 } // namespace ash 132 } // namespace ash
137 133
138 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 134 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/common/wm_window_user_data_unittest.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698