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

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

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content 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/aura/wm_shelf_aura.h ('k') | ash/common/shelf/wm_shelf.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/aura/wm_shelf_aura.h" 5 #include "ash/aura/wm_shelf_aura.h"
6 6
7 #include "ash/aura/wm_window_aura.h" 7 #include "ash/aura/wm_window_aura.h"
8 #include "ash/common/shelf/wm_shelf_observer.h" 8 #include "ash/common/shelf/wm_shelf_observer.h"
9 #include "ash/common/wm_window.h" 9 #include "ash/common/wm_window.h"
10 #include "ash/shelf/shelf.h" 10 #include "ash/shelf/shelf.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 } 52 }
53 53
54 WmWindow* WmShelfAura::GetWindow() { 54 WmWindow* WmShelfAura::GetWindow() {
55 return WmWindowAura::Get(shelf_->shelf_widget()->GetNativeView()); 55 return WmWindowAura::Get(shelf_->shelf_widget()->GetNativeView());
56 } 56 }
57 57
58 ShelfAlignment WmShelfAura::GetAlignment() const { 58 ShelfAlignment WmShelfAura::GetAlignment() const {
59 return shelf_->alignment(); 59 return shelf_->alignment();
60 } 60 }
61 61
62 void WmShelfAura::SetAlignment(ShelfAlignment alignment) {
63 shelf_->SetAlignment(alignment);
64 }
65
66 ShelfAutoHideBehavior WmShelfAura::GetAutoHideBehavior() const {
67 return shelf_->auto_hide_behavior();
68 }
69
70 void WmShelfAura::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
71 shelf_->SetAutoHideBehavior(behavior);
72 }
73
62 ShelfBackgroundType WmShelfAura::GetBackgroundType() const { 74 ShelfBackgroundType WmShelfAura::GetBackgroundType() const {
63 return shelf_->shelf_widget()->GetBackgroundType(); 75 return shelf_->shelf_widget()->GetBackgroundType();
64 } 76 }
65 77
66 void WmShelfAura::UpdateVisibilityState() { 78 void WmShelfAura::UpdateVisibilityState() {
67 shelf_->shelf_layout_manager()->UpdateVisibilityState(); 79 shelf_->shelf_layout_manager()->UpdateVisibilityState();
68 } 80 }
69 81
70 ShelfVisibilityState WmShelfAura::GetVisibilityState() const { 82 ShelfVisibilityState WmShelfAura::GetVisibilityState() const {
71 return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state() 83 return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state()
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 void WmShelfAura::WillChangeVisibilityState(ShelfVisibilityState new_state) { 115 void WmShelfAura::WillChangeVisibilityState(ShelfVisibilityState new_state) {
104 FOR_EACH_OBSERVER(WmShelfObserver, observers_, 116 FOR_EACH_OBSERVER(WmShelfObserver, observers_,
105 WillChangeVisibilityState(new_state)); 117 WillChangeVisibilityState(new_state));
106 } 118 }
107 119
108 void WmShelfAura::OnShelfIconPositionsChanged() { 120 void WmShelfAura::OnShelfIconPositionsChanged() {
109 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); 121 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
110 } 122 }
111 123
112 } // namespace ash 124 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shelf_aura.h ('k') | ash/common/shelf/wm_shelf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698