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

Unified Diff: ash/system/tray/tray_container.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 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/system/tray/tray_container.h ('k') | ash/system/tray/tray_item_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_container.cc
diff --git a/ash/system/tray/tray_container.cc b/ash/system/tray/tray_container.cc
index 0514967b3e29b6c0283d1cf4330c86a81c6e7de7..85c513d721d19edd92b30bf62ed371d96616678b 100644
--- a/ash/system/tray/tray_container.cc
+++ b/ash/system/tray/tray_container.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
#include "ash/system/tray/tray_constants.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/views/border.h"
@@ -14,8 +14,8 @@
namespace ash {
-TrayContainer::TrayContainer(WmShelf* wm_shelf) : wm_shelf_(wm_shelf) {
- DCHECK(wm_shelf_);
+TrayContainer::TrayContainer(Shelf* shelf) : shelf_(shelf) {
+ DCHECK(shelf_);
UpdateLayout();
}
@@ -47,7 +47,7 @@ void TrayContainer::ViewHierarchyChanged(
}
void TrayContainer::UpdateLayout() {
- const bool is_horizontal = wm_shelf_->IsHorizontalAlignment();
+ const bool is_horizontal = shelf_->IsHorizontalAlignment();
// Adjust the size of status tray dark background by adding additional
// empty border.
« no previous file with comments | « ash/system/tray/tray_container.h ('k') | ash/system/tray/tray_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698