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

Unified Diff: mash/shelf/shelf_view.h

Issue 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojom
Patch Set: . Created 4 years, 10 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 | « mash/shelf/shelf_tooltip_manager.cc ('k') | mash/shelf/shelf_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/shelf/shelf_view.h
diff --git a/mash/shelf/shelf_view.h b/mash/shelf/shelf_view.h
index bf3e81afe12bfdc931a3a788cdb163c2f53c18c4..1a799bebf9cc1bbc5a4efdd75a41a755ea9f7a1d 100644
--- a/mash/shelf/shelf_view.h
+++ b/mash/shelf/shelf_view.h
@@ -24,7 +24,7 @@
#include "ui/views/view_model.h"
namespace mojo {
-class ApplicationImpl;
+class Shell;
}
namespace ui {
@@ -60,10 +60,10 @@ class ShelfView : public views::View,
public views::FocusTraversable,
public views::BoundsAnimatorObserver {
public:
- explicit ShelfView(mojo::ApplicationImpl* app);
+ explicit ShelfView(mojo::Shell* shell);
~ShelfView() override;
- mojo::ApplicationImpl* app() const { return app_; }
+ mojo::Shell* shell() const { return shell_; }
void SetAlignment(ShelfAlignment alignment);
@@ -312,7 +312,7 @@ class ShelfView : public views::View,
int CalculateShelfDistance(const gfx::Point& coordinate) const;
// The shelf application instance.
- mojo::ApplicationImpl* app_;
+ mojo::Shell* shell_;
// The shelf model.
ShelfModel model_;
« no previous file with comments | « mash/shelf/shelf_tooltip_manager.cc ('k') | mash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698