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

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

Issue 45973003: ash: Rename LauncherIconObserver to ShelfIconObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ash/launcher/launcher.h ('k') | ash/launcher/launcher_icon_observer.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/launcher/launcher.h" 5 #include "ash/launcher/launcher.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "ash/focus_cycler.h" 10 #include "ash/focus_cycler.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 item_delegate->ItemSelected(event); 114 item_delegate->ItemSelected(event);
115 } 115 }
116 116
117 void Launcher::CycleWindowLinear(CycleDirection direction) { 117 void Launcher::CycleWindowLinear(CycleDirection direction) {
118 int item_index = GetNextActivatedItemIndex( 118 int item_index = GetNextActivatedItemIndex(
119 *(shelf_view_->model()), direction); 119 *(shelf_view_->model()), direction);
120 if (item_index >= 0) 120 if (item_index >= 0)
121 ActivateLauncherItem(item_index); 121 ActivateLauncherItem(item_index);
122 } 122 }
123 123
124 void Launcher::AddIconObserver(LauncherIconObserver* observer) { 124 void Launcher::AddIconObserver(ShelfIconObserver* observer) {
125 shelf_view_->AddIconObserver(observer); 125 shelf_view_->AddIconObserver(observer);
126 } 126 }
127 127
128 void Launcher::RemoveIconObserver(LauncherIconObserver* observer) { 128 void Launcher::RemoveIconObserver(ShelfIconObserver* observer) {
129 shelf_view_->RemoveIconObserver(observer); 129 shelf_view_->RemoveIconObserver(observer);
130 } 130 }
131 131
132 bool Launcher::IsShowingMenu() const { 132 bool Launcher::IsShowingMenu() const {
133 return shelf_view_->IsShowingMenu(); 133 return shelf_view_->IsShowingMenu();
134 } 134 }
135 135
136 bool Launcher::IsShowingOverflowBubble() const { 136 bool Launcher::IsShowingOverflowBubble() const {
137 return shelf_view_->IsShowingOverflowBubble(); 137 return shelf_view_->IsShowingOverflowBubble();
138 } 138 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 gfx::Rect Launcher::GetVisibleItemsBoundsInScreen() const { 189 gfx::Rect Launcher::GetVisibleItemsBoundsInScreen() const {
190 return shelf_view_->GetVisibleItemsBoundsInScreen(); 190 return shelf_view_->GetVisibleItemsBoundsInScreen();
191 } 191 }
192 192
193 app_list::ApplicationDragAndDropHost* Launcher::GetDragAndDropHostForAppList() { 193 app_list::ApplicationDragAndDropHost* Launcher::GetDragAndDropHostForAppList() {
194 return shelf_view_; 194 return shelf_view_;
195 } 195 }
196 196
197 } // namespace ash 197 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher.h ('k') | ash/launcher/launcher_icon_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698