diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 01:30:04 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 01:30:04 +0000 |
| commit | 99c5ed8e3fd3a26b79a7e7c91235bb0ad23cc30b (patch) | |
| tree | d9244fe9e4e1a07f07a79d87b832ed01bcb89352 /ash/shelf/shelf_widget_unittest.cc | |
| parent | 466b2c53add7fbad7e447729fbd3268c3be66361 (diff) | |
| download | chromium_src-99c5ed8e3fd3a26b79a7e7c91235bb0ad23cc30b.zip chromium_src-99c5ed8e3fd3a26b79a7e7c91235bb0ad23cc30b.tar.gz chromium_src-99c5ed8e3fd3a26b79a7e7c91235bb0ad23cc30b.tar.bz2 | |
ash: Move launcher_view* to shelf/ directory.
BUG=248353
TEST=none, no functional changes.
R=jamescook@chromium.org, xiyuan@chromium.org
TBR=sky@chromium.org # for chrome/browser/ui
Review URL: https://codereview.chromium.org/27628002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/shelf_widget_unittest.cc')
| -rw-r--r-- | ash/shelf/shelf_widget_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc index b12549f..6004a6c 100644 --- a/ash/shelf/shelf_widget_unittest.cc +++ b/ash/shelf/shelf_widget_unittest.cc @@ -7,13 +7,13 @@ #include "ash/launcher/launcher.h" #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/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_view.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/launcher_test_api.h" -#include "ash/test/launcher_view_test_api.h" +#include "ash/test/shelf_view_test_api.h" #include "ash/wm/window_util.h" #include "ui/aura/root_window.h" #include "ui/gfx/display.h" @@ -141,7 +141,7 @@ TEST_F(ShelfWidgetTest, LauncherInitiallySized) { // Test only makes sense if the status is > 0, which it better be. EXPECT_GT(status_width, 0); EXPECT_EQ(status_width, shelf_widget->GetContentsView()->width() - - test::LauncherTestAPI(launcher).launcher_view()->width()); + test::LauncherTestAPI(launcher).shelf_view()->width()); } // Verifies when the shell is deleted with a full screen window we don't crash. @@ -187,7 +187,7 @@ TEST_F(ShelfWidgetTest, LauncherInitiallySizedAfterLogin) { EXPECT_GT(status_width, 0); EXPECT_EQ(status_width, shelf->GetContentsView()->width() - - test::LauncherTestAPI(launcher).launcher_view()->width()); + test::LauncherTestAPI(launcher).shelf_view()->width()); } #endif |