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

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

Issue 2821203002: cros: Adds ShellPort functions for simplified display mode (Closed)
Patch Set: cleanup 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
« no previous file with comments | « no previous file | ash/aura/shell_port_classic.cc » ('j') | ash/host/ash_window_tree_host.h » ('J')
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_SHELL_PORT_CLASSIC_H_ 5 #ifndef ASH_AURA_SHELL_PORT_CLASSIC_H_
6 #define ASH_AURA_SHELL_PORT_CLASSIC_H_ 6 #define ASH_AURA_SHELL_PORT_CLASSIC_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 void AddDisplayObserver(WmDisplayObserver* observer) override; 71 void AddDisplayObserver(WmDisplayObserver* observer) override;
72 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 72 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
73 void AddPointerWatcher(views::PointerWatcher* watcher, 73 void AddPointerWatcher(views::PointerWatcher* watcher,
74 views::PointerWatcherEventTypes events) override; 74 views::PointerWatcherEventTypes events) override;
75 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 75 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
76 bool IsTouchDown() override; 76 bool IsTouchDown() override;
77 void ToggleIgnoreExternalKeyboard() override; 77 void ToggleIgnoreExternalKeyboard() override;
78 void SetLaserPointerEnabled(bool enabled) override; 78 void SetLaserPointerEnabled(bool enabled) override;
79 void SetPartialMagnifierEnabled(bool enabled) override; 79 void SetPartialMagnifierEnabled(bool enabled) override;
80 void CreatePointerWatcherAdapter() override; 80 void CreatePointerWatcherAdapter() override;
81 AshWindowTreeHost* CreateAshWindowTreeHost(
82 const AshWindowTreeHostInitParams& init_params) override;
81 void CreatePrimaryHost() override; 83 void CreatePrimaryHost() override;
82 void InitHosts(const ShellInitParams& init_params) override; 84 void InitHosts(const ShellInitParams& init_params) override;
85 std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate()
86 override;
83 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override; 87 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;
84 88
85 private: 89 private:
86 // WindowTreeHostManager::Observer: 90 // WindowTreeHostManager::Observer:
87 void OnDisplayConfigurationChanging() override; 91 void OnDisplayConfigurationChanging() override;
88 void OnDisplayConfigurationChanged() override; 92 void OnDisplayConfigurationChanged() override;
89 93
90 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_; 94 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
91 95
92 bool added_display_observer_ = false; 96 bool added_display_observer_ = false;
93 base::ObserverList<WmDisplayObserver> display_observers_; 97 base::ObserverList<WmDisplayObserver> display_observers_;
94 98
95 std::unique_ptr<AcceleratorControllerDelegateAura> 99 std::unique_ptr<AcceleratorControllerDelegateAura>
96 accelerator_controller_delegate_; 100 accelerator_controller_delegate_;
97 101
98 DISALLOW_COPY_AND_ASSIGN(ShellPortClassic); 102 DISALLOW_COPY_AND_ASSIGN(ShellPortClassic);
99 }; 103 };
100 104
101 } // namespace ash 105 } // namespace ash
102 106
103 #endif // ASH_AURA_SHELL_PORT_CLASSIC_H_ 107 #endif // ASH_AURA_SHELL_PORT_CLASSIC_H_
OLDNEW
« no previous file with comments | « no previous file | ash/aura/shell_port_classic.cc » ('j') | ash/host/ash_window_tree_host.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698