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

Side by Side Diff: ash/common/wm_shell.cc

Issue 2237903003: mash: Migrate Shelf aura::Window uses to WmWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move shelf notify functions to WmShell. Created 4 years, 4 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/common/wm_shell.h ('k') | ash/root_window_controller.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 #include "ash/common/wm_shell.h" 5 #include "ash/common/wm_shell.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/accelerators/ash_focus_manager_factory.h" 10 #include "ash/common/accelerators/ash_focus_manager_factory.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 WmWindow* root_window) { 102 WmWindow* root_window) {
103 FOR_EACH_OBSERVER(ShellObserver, shell_observers_, 103 FOR_EACH_OBSERVER(ShellObserver, shell_observers_,
104 OnFullscreenStateChanged(is_fullscreen, root_window)); 104 OnFullscreenStateChanged(is_fullscreen, root_window));
105 } 105 }
106 106
107 void WmShell::NotifyPinnedStateChanged(WmWindow* pinned_window) { 107 void WmShell::NotifyPinnedStateChanged(WmWindow* pinned_window) {
108 FOR_EACH_OBSERVER(ShellObserver, shell_observers_, 108 FOR_EACH_OBSERVER(ShellObserver, shell_observers_,
109 OnPinnedStateChanged(pinned_window)); 109 OnPinnedStateChanged(pinned_window));
110 } 110 }
111 111
112 void WmShell::OnVirtualKeyboardActivated(bool activated) { 112 void WmShell::NotifyVirtualKeyboardActivated(bool activated) {
113 FOR_EACH_OBSERVER(ShellObserver, shell_observers_, 113 FOR_EACH_OBSERVER(ShellObserver, shell_observers_,
114 OnVirtualKeyboardStateChanged(activated)); 114 OnVirtualKeyboardStateChanged(activated));
115 } 115 }
116 116
117 void WmShell::NotifyShelfCreatedForRootWindow(WmWindow* root_window) {
118 FOR_EACH_OBSERVER(ShellObserver, shell_observers_,
119 OnShelfCreatedForRootWindow(root_window));
120 }
121
122 void WmShell::NotifyShelfAlignmentChanged(WmWindow* root_window) {
123 FOR_EACH_OBSERVER(ShellObserver, shell_observers_,
124 OnShelfAlignmentChanged(root_window));
125 }
126
127 void WmShell::NotifyShelfAutoHideBehaviorChanged(WmWindow* root_window) {
128 FOR_EACH_OBSERVER(ShellObserver, shell_observers_,
129 OnShelfAutoHideBehaviorChanged(root_window));
130 }
131
117 void WmShell::AddShellObserver(ShellObserver* observer) { 132 void WmShell::AddShellObserver(ShellObserver* observer) {
118 shell_observers_.AddObserver(observer); 133 shell_observers_.AddObserver(observer);
119 } 134 }
120 135
121 void WmShell::RemoveShellObserver(ShellObserver* observer) { 136 void WmShell::RemoveShellObserver(ShellObserver* observer) {
122 shell_observers_.RemoveObserver(observer); 137 shell_observers_.RemoveObserver(observer);
123 } 138 }
124 139
125 void WmShell::OnLockStateEvent(LockStateObserver::EventType event) { 140 void WmShell::OnLockStateEvent(LockStateObserver::EventType event) {
126 FOR_EACH_OBSERVER(LockStateObserver, lock_state_observers_, 141 FOR_EACH_OBSERVER(LockStateObserver, lock_state_observers_,
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 void WmShell::DeleteToastManager() { 288 void WmShell::DeleteToastManager() {
274 toast_manager_.reset(); 289 toast_manager_.reset();
275 } 290 }
276 291
277 void WmShell::SetAcceleratorController( 292 void WmShell::SetAcceleratorController(
278 std::unique_ptr<AcceleratorController> accelerator_controller) { 293 std::unique_ptr<AcceleratorController> accelerator_controller) {
279 accelerator_controller_ = std::move(accelerator_controller); 294 accelerator_controller_ = std::move(accelerator_controller);
280 } 295 }
281 296
282 } // namespace ash 297 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698