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

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

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month 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_layout_manager_unittest.cc ('k') | ash/wm/system_gesture_event_filter_unittest.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 9a012179a6bcc97a43ef85d4c928b12f6c723be4..d84a683de5588d3f9eaa175a20e1ca645c304547 100644
--- a/ash/wm/panels/panel_window_resizer_unittest.cc
+++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -5,9 +5,9 @@
#include "ash/wm/panels/panel_window_resizer.h"
#include "ash/launcher/launcher.h"
-#include "ash/launcher/launcher_model.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_model.h"
#include "ash/shelf/shelf_types.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
@@ -39,7 +39,7 @@ class PanelWindowResizerTest : public test::AshTestBase {
AshTestBase::SetUp();
UpdateDisplay("600x400");
test::ShellTestApi test_api(Shell::GetInstance());
- model_ = test_api.launcher_model();
+ model_ = test_api.shelf_model();
launcher_delegate_ = test::TestLauncherDelegate::instance();
}
@@ -186,7 +186,7 @@ class PanelWindowResizerTest : public test::AshTestBase {
private:
scoped_ptr<WindowResizer> resizer_;
internal::PanelLayoutManager* panel_layout_manager_;
- LauncherModel* model_;
+ ShelfModel* model_;
test::TestLauncherDelegate* launcher_delegate_;
DISALLOW_COPY_AND_ASSIGN(PanelWindowResizerTest);
« no previous file with comments | « ash/wm/panels/panel_layout_manager_unittest.cc ('k') | ash/wm/system_gesture_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698