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

Unified Diff: ash/shell/shell_delegate_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: 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
Index: ash/shell/shell_delegate_impl.h
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index baf56f22ce7169d1921ec4d9b98723bfef181926..6edc418daa55b83080531636c13385e3fb984a2a 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -23,8 +23,6 @@ class KeyboardUI;
namespace ash {
namespace shell {
-class ShelfDelegateImpl;
-
class ShellDelegateImpl : public ShellDelegate {
public:
ShellDelegateImpl();
@@ -57,7 +55,7 @@ class ShellDelegateImpl : public ShellDelegate {
gfx::Image GetDeprecatedAcceleratorImage() const override;
private:
- ShelfDelegateImpl* shelf_delegate_;
+ ShelfDelegate* shelf_delegate_;
std::unique_ptr<app_list::AppListPresenterDelegateFactory>
app_list_presenter_delegate_factory_;
std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;

Powered by Google App Engine
This is Rietveld 408576698