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

Unified Diff: ash/shelf/shelf.h

Issue 2039253002: Removing ash::Shelf::shelf_model() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@launcher_controller_shelf_model_2
Patch Set: Another rebase. Created 4 years, 6 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 | « no previous file | ash/shelf/shelf.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf.h
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index 1292e1583c39fdcc7b984ebc13cce2b6b2cd5040..adecec1a1248879401900f47397d4d50a1ac1611 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -13,7 +13,6 @@
#include "ash/common/shelf/shelf_constants.h"
#include "ash/common/shelf/shelf_types.h"
#include "ash/shelf/shelf_locking_manager.h"
-#include "ash/shelf/shelf_view.h"
#include "ash/shelf/shelf_widget.h"
#include "base/macros.h"
#include "ui/gfx/geometry/size.h"
@@ -40,6 +39,7 @@ class FocusCycler;
class ShelfDelegate;
class ShelfIconObserver;
class ShelfModel;
+class ShelfView;
namespace test {
class ShelfTestAPI;
@@ -140,8 +140,6 @@ class ASH_EXPORT Shelf {
ShelfWidget* shelf_widget() { return shelf_widget_; }
- ShelfModel* shelf_model() { return shelf_view_->model(); }
-
// TODO(msw): ShelfLayoutManager should not be accessed externally.
ShelfLayoutManager* shelf_layout_manager() {
return shelf_widget_->shelf_layout_manager();
« no previous file with comments | « no previous file | ash/shelf/shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698