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

Unified Diff: ash/wm/panel_layout_manager_unittest.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 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
Index: ash/wm/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panel_layout_manager_unittest.cc b/ash/wm/panel_layout_manager_unittest.cc
index 7f539af3dd7ef612b16db171074d28b8676feeaf..3b7ce6d8bc817a5d019edaf126a019daa9799962 100644
--- a/ash/wm/panel_layout_manager_unittest.cc
+++ b/ash/wm/panel_layout_manager_unittest.cc
@@ -9,7 +9,9 @@
#include "ash/launcher/launcher_button.h"
#include "ash/launcher/launcher_model.h"
#include "ash/launcher/launcher_view.h"
+#include "ash/root_window_controller.h"
#include "ash/screen_ash.h"
+#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
@@ -123,7 +125,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {
// the launcher icon.
EXPECT_LE(window_bounds.x(), icon_bounds.x());
EXPECT_GE(window_bounds.right(), icon_bounds.right());
- EXPECT_EQ(launcher->widget()->GetWindowBoundsInScreen().y(),
+ EXPECT_EQ(launcher->shelf_widget()->GetWindowBoundsInScreen().y(),
window_bounds.bottom());
}

Powered by Google App Engine
This is Rietveld 408576698