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

Side by Side Diff: ash/wm/aura/wm_shelf_aura.cc

Issue 2030593002: Renames ash/wm/common into ash/common/wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/wm/aura/wm_shelf_aura.h ('k') | ash/wm/aura/wm_window_aura.h » ('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/wm/aura/wm_shelf_aura.h" 5 #include "ash/wm/aura/wm_shelf_aura.h"
6 6
7 #include "ash/common/wm/shelf/wm_shelf_observer.h"
8 #include "ash/common/wm/wm_window.h"
7 #include "ash/shelf/shelf.h" 9 #include "ash/shelf/shelf.h"
8 #include "ash/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/wm/aura/wm_window_aura.h" 11 #include "ash/wm/aura/wm_window_aura.h"
10 #include "ash/wm/common/shelf/wm_shelf_observer.h"
11 #include "ash/wm/common/wm_window.h"
12 #include "ui/views/widget/widget.h" 12 #include "ui/views/widget/widget.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace wm { 15 namespace wm {
16 16
17 WmShelfAura::WmShelfAura(Shelf* shelf) 17 WmShelfAura::WmShelfAura(Shelf* shelf)
18 : shelf_(shelf), shelf_layout_manager_(shelf->shelf_layout_manager()) { 18 : shelf_(shelf), shelf_layout_manager_(shelf->shelf_layout_manager()) {
19 shelf_layout_manager_->AddObserver(this); 19 shelf_layout_manager_->AddObserver(this);
20 shelf_->AddIconObserver(this); 20 shelf_->AddIconObserver(this);
21 } 21 }
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 FOR_EACH_OBSERVER(WmShelfObserver, observers_, 86 FOR_EACH_OBSERVER(WmShelfObserver, observers_,
87 WillChangeVisibilityState(new_state)); 87 WillChangeVisibilityState(new_state));
88 } 88 }
89 89
90 void WmShelfAura::OnShelfIconPositionsChanged() { 90 void WmShelfAura::OnShelfIconPositionsChanged() {
91 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); 91 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
92 } 92 }
93 93
94 } // namespace wm 94 } // namespace wm
95 } // namespace ash 95 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/aura/wm_shelf_aura.h ('k') | ash/wm/aura/wm_window_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698