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

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

Issue 2761373002: Move yet more from WmShell to Shell (Closed)
Patch Set: merge 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/accelerators/accelerator_filter_unittest.cc ('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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 bool IsTouchDown() override; 79 bool IsTouchDown() override;
80 void ToggleIgnoreExternalKeyboard() override; 80 void ToggleIgnoreExternalKeyboard() override;
81 void SetLaserPointerEnabled(bool enabled) override; 81 void SetLaserPointerEnabled(bool enabled) override;
82 void SetPartialMagnifierEnabled(bool enabled) override; 82 void SetPartialMagnifierEnabled(bool enabled) override;
83 void CreatePointerWatcherAdapter() override; 83 void CreatePointerWatcherAdapter() override;
84 void CreatePrimaryHost() override; 84 void CreatePrimaryHost() override;
85 void InitHosts(const ShellInitParams& init_params) override; 85 void InitHosts(const ShellInitParams& init_params) override;
86 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override; 86 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;
87 87
88 private: 88 private:
89 // SessionStateObserver:
90 void SessionStateChanged(session_manager::SessionState state) override;
91
92 // WindowTreeHostManager::Observer: 89 // WindowTreeHostManager::Observer:
93 void OnDisplayConfigurationChanging() override; 90 void OnDisplayConfigurationChanging() override;
94 void OnDisplayConfigurationChanged() override; 91 void OnDisplayConfigurationChanged() override;
95 92
96 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_; 93 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
97 94
98 bool added_display_observer_ = false; 95 bool added_display_observer_ = false;
99 base::ObserverList<WmDisplayObserver> display_observers_; 96 base::ObserverList<WmDisplayObserver> display_observers_;
100 97
101 std::unique_ptr<AcceleratorControllerDelegateAura> 98 std::unique_ptr<AcceleratorControllerDelegateAura>
102 accelerator_controller_delegate_; 99 accelerator_controller_delegate_;
103 100
104 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 101 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
105 }; 102 };
106 103
107 } // namespace ash 104 } // namespace ash
108 105
109 #endif // ASH_AURA_WM_SHELL_AURA_H_ 106 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_filter_unittest.cc ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698