ash/aura/shell_port_classic.h - Issue 2843193002: chromeos: fix focus for mushrome

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

Issue 2843193002: chromeos: fix focus for mushrome (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:

« no previous file with comments | « ash/BUILD.gn ('k') | ash/aura/shell_port_classic.cc » ('j') | ash/mus/bridge/shell_port_mash.h » ('J')

OLD	NEW
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 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 std::unique_ptr<AshWindowTreeHost> CreateAshWindowTreeHost(	81 std::unique_ptr<AshWindowTreeHost> CreateAshWindowTreeHost(

82 const AshWindowTreeHostInitParams& init_params) override;	82 const AshWindowTreeHostInitParams& init_params) override;

83 void CreatePrimaryHost() override;	83 void CreatePrimaryHost() override;

84 void InitHosts(const ShellInitParams& init_params) override;	84 void InitHosts(const ShellInitParams& init_params) override;

85 std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate()	85 std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate()

86 override;	86 override;

87 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;	87 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override;

	88 void OnCreatedRootWindowContainers(
	msw 2017/04/26 23:01:07 nit: belongs after CreateAshWindowTreeHost, ditto nit: belongs after CreateAshWindowTreeHost, ditto for definition sky 2017/04/26 23:30:27 Done. Show quoted text On 2017/04/26 23:01:07, msw wrote: > nit: belongs after CreateAshWindowTreeHost, ditto for definition Done.
	89 RootWindowController* root_window_controller) override;

88	90

89 private:	91 private:

90 // WindowTreeHostManager::Observer:	92 // WindowTreeHostManager::Observer:

91 void OnDisplayConfigurationChanging() override;	93 void OnDisplayConfigurationChanging() override;

92 void OnDisplayConfigurationChanged() override;	94 void OnDisplayConfigurationChanged() override;

93	95

94 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;	96 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;

95	97

96 bool added_display_observer_ = false;	98 bool added_display_observer_ = false;

97 base::ObserverList<WmDisplayObserver> display_observers_;	99 base::ObserverList<WmDisplayObserver> display_observers_;

98	100

99 std::unique_ptr<AcceleratorControllerDelegateAura>	101 std::unique_ptr<AcceleratorControllerDelegateAura>

100 accelerator_controller_delegate_;	102 accelerator_controller_delegate_;

101	103

102 DISALLOW_COPY_AND_ASSIGN(ShellPortClassic);	104 DISALLOW_COPY_AND_ASSIGN(ShellPortClassic);

103 };	105 };

104	106

105 } // namespace ash	107 } // namespace ash

106	108

107 #endif // ASH_AURA_SHELL_PORT_CLASSIC_H_	109 #endif // ASH_AURA_SHELL_PORT_CLASSIC_H_

OLD	NEW