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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.h

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/launcher_context_menu.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.h b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
index 85084858019d9eff7cc25ffbbe67ee15063641ca..c24279d622ae39b182304de6340abc93cf43a16e 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.h
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
@@ -13,7 +13,7 @@
class ChromeLauncherController;
namespace ash {
-class WmShelf;
+class Shelf;
}
// Base class for context menu which is shown for a regular extension item in
@@ -44,7 +44,7 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
// Static function to create contextmenu instance.
static LauncherContextMenu* Create(ChromeLauncherController* controller,
const ash::ShelfItem* item,
- ash::WmShelf* wm_shelf);
+ ash::Shelf* shelf);
// ui::SimpleMenuModel::Delegate overrides:
bool IsItemForCommandIdDynamic(int command_id) const override;
@@ -56,7 +56,7 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
protected:
LauncherContextMenu(ChromeLauncherController* controller,
const ash::ShelfItem* item,
- ash::WmShelf* wm_shelf);
+ ash::Shelf* shelf);
ChromeLauncherController* controller() const { return controller_; }
const ash::ShelfItem& item() const { return item_; }
@@ -77,7 +77,7 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
ash::ShelfAlignmentMenu shelf_alignment_menu_;
- ash::WmShelf* wm_shelf_;
+ ash::Shelf* shelf_;
DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);
};

Powered by Google App Engine
This is Rietveld 408576698