summaryrefslogtreecommitdiffstats
path: root/ash/dip_unittest.cc
diff options
context:
space:
mode:
authorharrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-09 02:50:58 +0000
committerharrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-09 02:50:58 +0000
commit478c6c3aa0165dfd120993c5ec0757d594e70fe6 (patch)
tree3dd95bfe585e857e3672c9cfa1e705e6cdd19416 /ash/dip_unittest.cc
parent62ad3097ac2d96a2e8c65769a997702e7f0a755b (diff)
downloadchromium_src-478c6c3aa0165dfd120993c5ec0757d594e70fe6.zip
chromium_src-478c6c3aa0165dfd120993c5ec0757d594e70fe6.tar.gz
chromium_src-478c6c3aa0165dfd120993c5ec0757d594e70fe6.tar.bz2
Refactor: Shelf Widget
Refactor the classes related with displaying the shelf (background behind the launcher/status area widget) to be a separate class. Removing background delegates from the launcher and status area widget (represented on tray views). TBR=ben@chromium.org BUG=163002 Review URL: https://chromiumcodereview.appspot.com/12313118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/dip_unittest.cc')
-rw-r--r--ash/dip_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
index 2c00d71a..c21fb88 100644
--- a/ash/dip_unittest.cc
+++ b/ash/dip_unittest.cc
@@ -7,6 +7,7 @@
#include "ash/display/display_manager.h"
#include "ash/launcher/launcher.h"
+#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_properties.h"
@@ -63,7 +64,7 @@ TEST_F(DIPTest, WorkArea) {
Launcher* launcher = Launcher::ForPrimaryDisplay();
EXPECT_EQ(
display_2x.bounds().InsetsFrom(work_area).height(),
- launcher->widget()->GetNativeView()->layer()->bounds().height());
+ launcher->shelf_widget()->GetNativeView()->layer()->bounds().height());
}
} // namespace ash