ash/aura/wm_shell_aura.h - Issue 2318223003: mash: Migrate wallpaper controllers to ash/common.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)

Patch Set: Cleanup. Created 4 years, 3 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

« ash/aura/wm_root_window_controller_aura.cc ('K') | « ash/aura/wm_root_window_controller_aura.cc ('k') | ash/aura/wm_shell_aura.cc » ('j') | ash/common/wallpaper/wallpaper_controller_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_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 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
75 void OnOverviewModeEnded() override;	75 void OnOverviewModeEnded() override;

76 SessionStateDelegate* GetSessionStateDelegate() override;	76 SessionStateDelegate* GetSessionStateDelegate() override;

77 void AddActivationObserver(WmActivationObserver* observer) override;	77 void AddActivationObserver(WmActivationObserver* observer) override;

78 void RemoveActivationObserver(WmActivationObserver* observer) override;	78 void RemoveActivationObserver(WmActivationObserver* observer) override;

79 void AddDisplayObserver(WmDisplayObserver* observer) override;	79 void AddDisplayObserver(WmDisplayObserver* observer) override;

80 void RemoveDisplayObserver(WmDisplayObserver* observer) override;	80 void RemoveDisplayObserver(WmDisplayObserver* observer) override;

81 void AddPointerWatcher(views::PointerWatcher* watcher,	81 void AddPointerWatcher(views::PointerWatcher* watcher,

82 views::PointerWatcherEventTypes events) override;	82 views::PointerWatcherEventTypes events) override;

83 void RemovePointerWatcher(views::PointerWatcher* watcher) override;	83 void RemovePointerWatcher(views::PointerWatcher* watcher) override;

84 bool IsTouchDown() override;	84 bool IsTouchDown() override;

	85 base::SequencedWorkerPool* GetBlockingPool() override;

85 #if defined(OS_CHROMEOS)	86 #if defined(OS_CHROMEOS)

86 void ToggleIgnoreExternalKeyboard() override;	87 void ToggleIgnoreExternalKeyboard() override;

87 #endif	88 #endif

88	89

89 private:	90 private:

90 // aura::client::ActivationChangeObserver:	91 // aura::client::ActivationChangeObserver:

91 void OnWindowActivated(ActivationReason reason,	92 void OnWindowActivated(ActivationReason reason,

92 aura::Window* gained_active,	93 aura::Window* gained_active,

93 aura::Window* lost_active) override;	94 aura::Window* lost_active) override;

94 void OnAttemptToReactivateWindow(aura::Window* request_active,	95 void OnAttemptToReactivateWindow(aura::Window* request_active,

(...skipping 11 matching lines...) Expand all Loading...
106	107

107 bool added_display_observer_ = false;	108 bool added_display_observer_ = false;

108 base::ObserverList<WmDisplayObserver> display_observers_;	109 base::ObserverList<WmDisplayObserver> display_observers_;

109	110

110 DISALLOW_COPY_AND_ASSIGN(WmShellAura);	111 DISALLOW_COPY_AND_ASSIGN(WmShellAura);

111 };	112 };

112	113

113 } // namespace ash	114 } // namespace ash

114	115

115 #endif // ASH_AURA_WM_SHELL_AURA_H_	116 #endif // ASH_AURA_WM_SHELL_AURA_H_

OLD	NEW