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

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

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/test/test_shelf_delegate.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
index d3007c6c4b2bedf325f07f07aeb14e13206a9931..dbffd9e264e27b7ef31d8dbb27b5fd291d0ca682 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
@@ -149,12 +149,12 @@ class ChromeLauncherControllerImpl
}
// ash::ShelfDelegate:
- void OnShelfCreated(ash::Shelf* shelf) override;
- void OnShelfDestroyed(ash::Shelf* shelf) override;
- void OnShelfAlignmentChanged(ash::Shelf* shelf) override;
- void OnShelfAutoHideBehaviorChanged(ash::Shelf* shelf) override;
- void OnShelfAutoHideStateChanged(ash::Shelf* shelf) override;
- void OnShelfVisibilityStateChanged(ash::Shelf* shelf) override;
+ void OnShelfCreated(ash::WmShelf* shelf) override;
+ void OnShelfDestroyed(ash::WmShelf* shelf) override;
+ void OnShelfAlignmentChanged(ash::WmShelf* shelf) override;
+ void OnShelfAutoHideBehaviorChanged(ash::WmShelf* shelf) override;
+ void OnShelfAutoHideStateChanged(ash::WmShelf* shelf) override;
+ void OnShelfVisibilityStateChanged(ash::WmShelf* shelf) override;
ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override;
bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override;
const std::string& GetAppIDForShelfID(ash::ShelfID id) override;
« no previous file with comments | « ash/test/test_shelf_delegate.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698