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

Unified Diff: ash/common/shelf/shelf.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: rebase again 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/common/shelf/shelf.h ('k') | ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf.cc
diff --git a/ash/common/shelf/shelf.cc b/ash/common/shelf/shelf.cc
deleted file mode 100644
index d67925249669b99b2fe52f7b89948646e10df890..0000000000000000000000000000000000000000
--- a/ash/common/shelf/shelf.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/common/shelf/shelf.h"
-
-#include "ash/common/shelf/shelf_delegate.h"
-#include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/wm_root_window_controller.h"
-#include "ash/common/wm_shell.h"
-#include "ash/common/wm_window.h"
-
-namespace ash {
-
-Shelf::Shelf(WmShelf* wm_shelf,
- ShelfView* shelf_view,
- ShelfWidget* shelf_widget)
- : wm_shelf_(wm_shelf),
- shelf_widget_(shelf_widget),
- shelf_view_(shelf_view) {
- DCHECK(wm_shelf_);
- DCHECK(shelf_view_);
- DCHECK(shelf_widget_);
-}
-
-Shelf::~Shelf() {
- WmShell::Get()->shelf_delegate()->OnShelfDestroyed(wm_shelf_);
-}
-
-// static
-Shelf* Shelf::ForPrimaryDisplay() {
- return Shelf::ForWindow(WmShell::Get()->GetPrimaryRootWindow());
-}
-
-// static
-Shelf* Shelf::ForWindow(WmWindow* window) {
- return window->GetRootWindowController()->GetShelf()->shelf();
-}
-
-} // namespace ash
« no previous file with comments | « ash/common/shelf/shelf.h ('k') | ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698