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

Unified Diff: ash/wm/ash_activation_controller_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/ash_activation_controller.cc ('k') | ash/wm/ash_focus_rules.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_activation_controller_unittest.cc
diff --git a/ash/wm/ash_activation_controller_unittest.cc b/ash/wm/ash_activation_controller_unittest.cc
index b0505c594dbb1b51b08cd941968b66fc232880f2..e332990e19aed13295d72329e76218090ed22b07 100644
--- a/ash/wm/ash_activation_controller_unittest.cc
+++ b/ash/wm/ash_activation_controller_unittest.cc
@@ -6,6 +6,7 @@
#include "ash/launcher/launcher.h"
#include "ash/root_window_controller.h"
+#include "ash/shelf/shelf_widget.h"
#include "ash/shell_delegate.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/property_util.h"
@@ -30,7 +31,7 @@ class AshActivationControllerTest : public test::AshTestBase {
ash_activation_controller_.reset(new internal::AshActivationController());
launcher_ = Launcher::ForPrimaryDisplay();
ASSERT_TRUE(launcher_);
- launcher_widget_ = launcher_->widget();
+ launcher_widget_ = launcher_->shelf_widget();
ASSERT_TRUE(launcher_widget_);
launcher_window_ = launcher_widget_->GetNativeWindow();
ASSERT_TRUE(launcher_window_);
« no previous file with comments | « ash/wm/ash_activation_controller.cc ('k') | ash/wm/ash_focus_rules.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698