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

Unified Diff: ash/wm/workspace_controller_unittest.cc

Issue 2825533003: mash: Prerequisites for removing ShelfDelegate. (Closed)
Patch Set: Expand CheckWindowAndItemPlacement comment. Created 3 years, 8 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/window_cycle_controller_unittest.cc ('k') | chrome/browser/chromeos/arc/arc_session_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller_unittest.cc
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc
index b2f18e21c06f6247d88729c7d8ed5c1b5d4a7c0c..1b53e6f279672ba0f6523d6cbc527b3e4bab4ea6 100644
--- a/ash/wm/workspace_controller_unittest.cc
+++ b/ash/wm/workspace_controller_unittest.cc
@@ -16,7 +16,6 @@
#include "ash/system/status_area_widget.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shell_test_api.h"
-#include "ash/test/test_shelf_delegate.h"
#include "ash/wm/panels/panel_layout_manager.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
@@ -120,7 +119,6 @@ class WorkspaceControllerTest : public test::AshTestBase {
aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
delegate, ui::wm::WINDOW_TYPE_PANEL, 0, bounds);
WmWindow* wm_window = WmWindow::Get(window);
- test::TestShelfDelegate::instance()->AddShelfItem(wm_window);
PanelLayoutManager::Get(wm_window)->Relayout();
return window;
}
« no previous file with comments | « ash/wm/window_cycle_controller_unittest.cc ('k') | chrome/browser/chromeos/arc/arc_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698