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

Unified Diff: ash/launcher/launcher.cc

Issue 97173003: ash: Rename more Launcher classes to Shelf*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: link chrome Created 7 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash.gyp ('k') | ash/launcher/launcher_item_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher.cc
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index 0adf72ac01e1fe706c0fcc683ea245ed44eb1e3b..02783259886999d7ae067db39ab613a95a850c3b 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -9,10 +9,10 @@
#include "ash/focus_cycler.h"
#include "ash/launcher/launcher_delegate.h"
-#include "ash/launcher/launcher_item_delegate.h"
-#include "ash/launcher/launcher_item_delegate_manager.h"
#include "ash/root_window_controller.h"
#include "ash/screen_ash.h"
+#include "ash/shelf/shelf_item_delegate.h"
+#include "ash/shelf/shelf_item_delegate_manager.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_model.h"
#include "ash/shelf/shelf_navigator.h"
@@ -108,10 +108,10 @@ void Launcher::ActivateLauncherItem(int index) {
ui::EF_NONE,
false);
- const ash::LauncherItem& item = shelf_view_->model()->items()[index];
- ash::LauncherItemDelegate* item_delegate =
- Shell::GetInstance()->launcher_item_delegate_manager()->
- GetLauncherItemDelegate(item.id);
+ const LauncherItem& item = shelf_view_->model()->items()[index];
+ ShelfItemDelegate* item_delegate =
+ Shell::GetInstance()->shelf_item_delegate_manager()->GetShelfItemDelegate(
+ item.id);
item_delegate->ItemSelected(event);
}
« no previous file with comments | « ash/ash.gyp ('k') | ash/launcher/launcher_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698