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

Unified Diff: ash/wm/panels/panel_window_resizer_unittest.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: safer shutdown (status_area_widget_) Created 7 years, 9 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/wm/panels/panel_window_resizer.cc ('k') | ash/wm/session_state_animator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panels/panel_window_resizer_unittest.cc
diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc
index 93fe71ab4f20dbfa7a683578fe41643dd9188046..4be464567b906f15ba5f803a969bc6b789c5f3fc 100644
--- a/ash/wm/panels/panel_window_resizer_unittest.cc
+++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -5,7 +5,9 @@
#include "ash/wm/panels/panel_window_resizer.h"
#include "ash/launcher/launcher.h"
-#include "ash/shelf_types.h"
+#include "ash/root_window_controller.h"
+#include "ash/shelf/shelf_types.h"
+#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
@@ -34,7 +36,7 @@ class PanelWindowResizerTest : public test::AshTestBase {
panel_layout_manager_ = static_cast<internal::PanelLayoutManager*>(
GetPanelContainer()->layout_manager());
- launcher_bounds_ = panel_layout_manager_->launcher()->widget()->
+ launcher_bounds_ = panel_layout_manager_->launcher()->shelf_widget()->
GetWindowBoundsInScreen();
}
« no previous file with comments | « ash/wm/panels/panel_window_resizer.cc ('k') | ash/wm/session_state_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698