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

Side by Side Diff: ash/aura/wm_shell_aura.h

Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)
Patch Set: Restructure based on feedback Created 4 years, 2 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_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 14 matching lines...) Expand all
25 public: 25 public:
26 explicit WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate); 26 explicit WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate);
27 ~WmShellAura() override; 27 ~WmShellAura() override;
28 28
29 static WmShellAura* Get(); 29 static WmShellAura* Get();
30 30
31 void CreatePointerWatcherAdapter(); 31 void CreatePointerWatcherAdapter();
32 32
33 // WmShell: 33 // WmShell:
34 void Shutdown() override; 34 void Shutdown() override;
35 bool IsRunningInMash() const override;
35 WmWindow* NewWindow(ui::wm::WindowType window_type, 36 WmWindow* NewWindow(ui::wm::WindowType window_type,
36 ui::LayerType layer_type) override; 37 ui::LayerType layer_type) override;
37 WmWindow* GetFocusedWindow() override; 38 WmWindow* GetFocusedWindow() override;
38 WmWindow* GetActiveWindow() override; 39 WmWindow* GetActiveWindow() override;
39 WmWindow* GetCaptureWindow() override; 40 WmWindow* GetCaptureWindow() override;
40 WmWindow* GetPrimaryRootWindow() override; 41 WmWindow* GetPrimaryRootWindow() override;
41 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; 42 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
42 const display::ManagedDisplayInfo& GetDisplayInfo( 43 const display::ManagedDisplayInfo& GetDisplayInfo(
43 int64_t display_id) const override; 44 int64_t display_id) const override;
44 bool IsActiveDisplayId(int64_t display_id) const override; 45 bool IsActiveDisplayId(int64_t display_id) const override;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 109
109 bool added_display_observer_ = false; 110 bool added_display_observer_ = false;
110 base::ObserverList<WmDisplayObserver> display_observers_; 111 base::ObserverList<WmDisplayObserver> display_observers_;
111 112
112 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 113 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
113 }; 114 };
114 115
115 } // namespace ash 116 } // namespace ash
116 117
117 #endif // ASH_AURA_WM_SHELL_AURA_H_ 118 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « ash/DEPS ('k') | ash/aura/wm_shell_aura.cc » ('j') | ash/common/mojo_interface_factory.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698