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

Unified Diff: ash/shell_unittest.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/shell_delegate.h ('k') | ash/system/date/tray_system_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index e1c99c91f329ba287476947d11dfd0e03ce71984..a115f5355412d94daa90f4717baeba3a56f8342a 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -13,9 +13,9 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/session/session_controller.h"
+#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shell_test_api.h"
@@ -438,7 +438,7 @@ TEST_F(ShellTest, ToggleAutoHide) {
window->Show();
wm::ActivateWindow(window.get());
- WmShelf* shelf = GetPrimaryShelf();
+ Shelf* shelf = GetPrimaryShelf();
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
« no previous file with comments | « ash/shell_delegate.h ('k') | ash/system/date/tray_system_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698