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

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

Issue 1943603002: Makes ash/wm/common a library (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 years, 7 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_root_window_controller_aura.cc ('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/shelf/shelf.h" 7 #include "ash/shelf/shelf.h"
8 #include "ash/shelf/shelf_layout_manager.h" 8 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/wm/aura/wm_window_aura.h" 9 #include "ash/wm/aura/wm_window_aura.h"
10 #include "ash/wm/common/shelf/wm_shelf_observer.h" 10 #include "ash/wm/common/shelf/wm_shelf_observer.h"
(...skipping 14 matching lines...) Expand all
25 if (shelf_layout_manager_) 25 if (shelf_layout_manager_)
26 shelf_layout_manager_->RemoveObserver(this); 26 shelf_layout_manager_->RemoveObserver(this);
27 } 27 }
28 28
29 // static 29 // static
30 Shelf* WmShelfAura::GetShelf(WmShelf* shelf) { 30 Shelf* WmShelfAura::GetShelf(WmShelf* shelf) {
31 return static_cast<WmShelfAura*>(shelf)->shelf_; 31 return static_cast<WmShelfAura*>(shelf)->shelf_;
32 } 32 }
33 33
34 WmWindow* WmShelfAura::GetWindow() { 34 WmWindow* WmShelfAura::GetWindow() {
35 return WmWindow::Get(shelf_->shelf_widget()); 35 return WmWindowAura::Get(shelf_->shelf_widget()->GetNativeView());
36 } 36 }
37 37
38 ShelfAlignment WmShelfAura::GetAlignment() const { 38 ShelfAlignment WmShelfAura::GetAlignment() const {
39 return shelf_->alignment(); 39 return shelf_->alignment();
40 } 40 }
41 41
42 ShelfBackgroundType WmShelfAura::GetBackgroundType() const { 42 ShelfBackgroundType WmShelfAura::GetBackgroundType() const {
43 return shelf_->shelf_widget()->GetBackgroundType(); 43 return shelf_->shelf_widget()->GetBackgroundType();
44 } 44 }
45 45
(...skipping 40 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_root_window_controller_aura.cc ('k') | ash/wm/aura/wm_window_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698