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

Unified Diff: ash/app_list/app_list_presenter_delegate_unittest.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback 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
Index: ash/app_list/app_list_presenter_delegate_unittest.cc
diff --git a/ash/app_list/app_list_presenter_delegate_unittest.cc b/ash/app_list/app_list_presenter_delegate_unittest.cc
index cfba64b48b8a7b7e88a9d46e302bac76ae816a8d..d554816c4b30abc599c2ef45436ad97f7e2baf9f 100644
--- a/ash/app_list/app_list_presenter_delegate_unittest.cc
+++ b/ash/app_list/app_list_presenter_delegate_unittest.cc
@@ -6,10 +6,10 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/test_app_list_view_presenter_impl.h"
#include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/macros.h"
#include "ui/app_list/views/app_list_view.h"
@@ -126,7 +126,7 @@ TEST_F(AppListPresenterDelegateTest, NonPrimaryDisplay) {
// Set up a screen with two displays (horizontally adjacent).
UpdateDisplay("1024x768,1024x768");
- std::vector<WmWindow*> root_windows = WmShell::Get()->GetAllRootWindows();
+ std::vector<WmWindow*> root_windows = ShellPort::Get()->GetAllRootWindows();
ASSERT_EQ(2u, root_windows.size());
WmWindow* secondary_root = root_windows[1];
EXPECT_EQ("1024,0 1024x768", secondary_root->GetBoundsInScreen().ToString());

Powered by Google App Engine
This is Rietveld 408576698