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

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

Issue 2421853003: Remove usage of FOR_EACH_OBSERVER macro in ash/ (Closed)
Patch Set: shell_observers Created 4 years, 2 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/common/keyboard/keyboard_ui.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/aura/wm_shell_aura.h" 5 #include "ash/aura/wm_shell_aura.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/aura/key_event_watcher_aura.h" 9 #include "ash/aura/key_event_watcher_aura.h"
10 #include "ash/aura/pointer_watcher_adapter.h" 10 #include "ash/aura/pointer_watcher_adapter.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 std::unique_ptr<ImmersiveFullscreenController> 232 std::unique_ptr<ImmersiveFullscreenController>
233 WmShellAura::CreateImmersiveFullscreenController() { 233 WmShellAura::CreateImmersiveFullscreenController() {
234 return base::MakeUnique<ImmersiveFullscreenController>(); 234 return base::MakeUnique<ImmersiveFullscreenController>();
235 } 235 }
236 236
237 std::unique_ptr<KeyEventWatcher> WmShellAura::CreateKeyEventWatcher() { 237 std::unique_ptr<KeyEventWatcher> WmShellAura::CreateKeyEventWatcher() {
238 return base::MakeUnique<KeyEventWatcherAura>(); 238 return base::MakeUnique<KeyEventWatcherAura>();
239 } 239 }
240 240
241 void WmShellAura::OnOverviewModeStarting() { 241 void WmShellAura::OnOverviewModeStarting() {
242 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), 242 for (auto& observer : *shell_observers())
243 OnOverviewModeStarting()); 243 observer.OnOverviewModeStarting();
244 } 244 }
245 245
246 void WmShellAura::OnOverviewModeEnded() { 246 void WmShellAura::OnOverviewModeEnded() {
247 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded()); 247 for (auto& observer : *shell_observers())
248 observer.OnOverviewModeEnded();
248 } 249 }
249 250
250 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() { 251 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() {
251 return Shell::GetInstance()->session_state_delegate(); 252 return Shell::GetInstance()->session_state_delegate();
252 } 253 }
253 254
254 void WmShellAura::AddActivationObserver(WmActivationObserver* observer) { 255 void WmShellAura::AddActivationObserver(WmActivationObserver* observer) {
255 if (!added_activation_observer_) { 256 if (!added_activation_observer_) {
256 added_activation_observer_ = true; 257 added_activation_observer_ = true;
257 Shell::GetInstance()->activation_client()->AddObserver(this); 258 Shell::GetInstance()->activation_client()->AddObserver(this);
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 for (auto& observer : display_observers_) 325 for (auto& observer : display_observers_)
325 observer.OnDisplayConfigurationChanging(); 326 observer.OnDisplayConfigurationChanging();
326 } 327 }
327 328
328 void WmShellAura::OnDisplayConfigurationChanged() { 329 void WmShellAura::OnDisplayConfigurationChanged() {
329 for (auto& observer : display_observers_) 330 for (auto& observer : display_observers_)
330 observer.OnDisplayConfigurationChanged(); 331 observer.OnDisplayConfigurationChanged();
331 } 332 }
332 333
333 } // namespace ash 334 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/common/keyboard/keyboard_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698