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

Side by Side Diff: ash/shelf/shelf.cc

Issue 2247503002: mash: Create and show a shelf in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix WindowManager WmShell::Shutdown; delay PointerWatcherEventRouter teardown; cleanup shutdown wor… 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/shelf/shelf.h" 5 #include "ash/shelf/shelf.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "ash/aura/wm_window_aura.h" 10 #include "ash/aura/wm_window_aura.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 item_delegate->ItemSelected(event); 129 item_delegate->ItemSelected(event);
130 } 130 }
131 131
132 void Shelf::CycleWindowLinear(CycleDirection direction) { 132 void Shelf::CycleWindowLinear(CycleDirection direction) {
133 int item_index = 133 int item_index =
134 GetNextActivatedItemIndex(*WmShell::Get()->shelf_model(), direction); 134 GetNextActivatedItemIndex(*WmShell::Get()->shelf_model(), direction);
135 if (item_index >= 0) 135 if (item_index >= 0)
136 ActivateShelfItem(item_index); 136 ActivateShelfItem(item_index);
137 } 137 }
138 138
139 void Shelf::AddIconObserver(ShelfIconObserver* observer) {
140 shelf_view_->AddIconObserver(observer);
141 }
142
143 void Shelf::RemoveIconObserver(ShelfIconObserver* observer) {
144 shelf_view_->RemoveIconObserver(observer);
145 }
146
147 bool Shelf::IsShowingMenu() const { 139 bool Shelf::IsShowingMenu() const {
148 return shelf_view_->IsShowingMenu(); 140 return shelf_view_->IsShowingMenu();
149 } 141 }
150 142
151 bool Shelf::IsShowingOverflowBubble() const { 143 bool Shelf::IsShowingOverflowBubble() const {
152 return shelf_view_->IsShowingOverflowBubble(); 144 return shelf_view_->IsShowingOverflowBubble();
153 } 145 }
154 146
155 bool Shelf::IsVisible() const { 147 bool Shelf::IsVisible() const {
156 return shelf_view_->visible(); 148 return shelf_view_->visible();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 187
196 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() { 188 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
197 return shelf_view_; 189 return shelf_view_;
198 } 190 }
199 191
200 void Shelf::UpdateShelfItemBackground(int alpha) { 192 void Shelf::UpdateShelfItemBackground(int alpha) {
201 shelf_view_->UpdateShelfItemBackground(alpha); 193 shelf_view_->UpdateShelfItemBackground(alpha);
202 } 194 }
203 195
204 } // namespace ash 196 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698