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

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

Issue 2642723007: chromeos: Removed enable magnifier from palette delegate. (Closed)
Patch Set: Trybot. Created 3 years, 11 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 | « no previous file | 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 SessionStateDelegate* GetSessionStateDelegate() override; 74 SessionStateDelegate* GetSessionStateDelegate() override;
75 void AddDisplayObserver(WmDisplayObserver* observer) override; 75 void AddDisplayObserver(WmDisplayObserver* observer) override;
76 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 76 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
77 void AddPointerWatcher(views::PointerWatcher* watcher, 77 void AddPointerWatcher(views::PointerWatcher* watcher,
78 views::PointerWatcherEventTypes events) override; 78 views::PointerWatcherEventTypes events) override;
79 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 79 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
80 void RequestShutdown() override; 80 void RequestShutdown() override;
81 bool IsTouchDown() override; 81 bool IsTouchDown() override;
82 void ToggleIgnoreExternalKeyboard() override; 82 void ToggleIgnoreExternalKeyboard() override;
83 void SetLaserPointerEnabled(bool enabled) override; 83 void SetLaserPointerEnabled(bool enabled) override;
84 void SetPartialMagnifierEnabled(bool enabled) override;
84 void CreatePointerWatcherAdapter() override; 85 void CreatePointerWatcherAdapter() override;
85 void CreatePrimaryHost() override; 86 void CreatePrimaryHost() override;
86 void InitHosts(const ShellInitParams& init_params) override; 87 void InitHosts(const ShellInitParams& init_params) override;
87 88
88 private: 89 private:
89 // SessionStateObserver: 90 // SessionStateObserver:
90 void SessionStateChanged(session_manager::SessionState state) override; 91 void SessionStateChanged(session_manager::SessionState state) override;
91 92
92 // WindowTreeHostManager::Observer: 93 // WindowTreeHostManager::Observer:
93 void OnDisplayConfigurationChanging() override; 94 void OnDisplayConfigurationChanging() override;
94 void OnDisplayConfigurationChanged() override; 95 void OnDisplayConfigurationChanged() override;
95 96
96 WmLookupAura wm_lookup_; 97 WmLookupAura wm_lookup_;
97 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_; 98 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
98 99
99 bool added_display_observer_ = false; 100 bool added_display_observer_ = false;
100 base::ObserverList<WmDisplayObserver> display_observers_; 101 base::ObserverList<WmDisplayObserver> display_observers_;
101 102
102 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 103 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
103 }; 104 };
104 105
105 } // namespace ash 106 } // namespace ash
106 107
107 #endif // ASH_AURA_WM_SHELL_AURA_H_ 108 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698