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

Unified Diff: ash/shelf/shelf_widget_unittest.cc

Issue 2279533002: ash: Convert ShelfDelegate to use WmShelf* instead of Shelf* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: curlies 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell/shelf_delegate_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget_unittest.cc
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc
index 842971130b53911300884adf44b62904a7810238..dcb41cf622e870bb4bd065deb5ec3663a6f79b6b 100644
--- a/ash/shelf/shelf_widget_unittest.cc
+++ b/ash/shelf/shelf_widget_unittest.cc
@@ -359,15 +359,15 @@ class TestShelfDelegate : public ShelfDelegate {
~TestShelfDelegate() override {}
// ShelfDelegate implementation.
- void OnShelfCreated(Shelf* shelf) override {
- shelf->wm_shelf()->SetAlignment(initial_alignment_);
- shelf->wm_shelf()->SetAutoHideBehavior(initial_auto_hide_behavior_);
+ void OnShelfCreated(WmShelf* shelf) override {
+ shelf->SetAlignment(initial_alignment_);
+ shelf->SetAutoHideBehavior(initial_auto_hide_behavior_);
}
- void OnShelfDestroyed(Shelf* shelf) override {}
- void OnShelfAlignmentChanged(Shelf* shelf) override {}
- void OnShelfAutoHideBehaviorChanged(Shelf* shelf) override {}
- void OnShelfAutoHideStateChanged(Shelf* shelf) override {}
- void OnShelfVisibilityStateChanged(Shelf* shelf) override {}
+ void OnShelfDestroyed(WmShelf* shelf) override {}
+ void OnShelfAlignmentChanged(WmShelf* shelf) override {}
+ void OnShelfAutoHideBehaviorChanged(WmShelf* shelf) override {}
+ void OnShelfAutoHideStateChanged(WmShelf* shelf) override {}
+ void OnShelfVisibilityStateChanged(WmShelf* shelf) override {}
ShelfID GetShelfIDForAppID(const std::string& app_id) override { return 0; }
bool HasShelfIDToAppIDMapping(ShelfID id) const override { return false; }
const std::string& GetAppIDForShelfID(ShelfID id) override {
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell/shelf_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698