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

Unified Diff: ash/wm/overview/window_selector_unittest.cc

Issue 251103005: Added arrow key navigation to Overview Mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplified RemoveWindow() Created 6 years, 7 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/wm/overview/window_selector_unittest.cc
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index 1b65eff9263a0190f1aa1a970e2aceae451b58fc..0dfba094e41ef328b938c6e4c8734fd691f05e18 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -16,6 +16,7 @@
#include "ash/test/shell_test_api.h"
#include "ash/test/test_shelf_delegate.h"
#include "ash/wm/mru_window_tracker.h"
+#include "ash/wm/overview/window_grid.h"
#include "ash/wm/overview/window_selector.h"
#include "ash/wm/overview/window_selector_controller.h"
#include "ash/wm/overview/window_selector_item.h"
@@ -164,9 +165,9 @@ class WindowSelectorTest : public test::AshTestBase {
Shell::GetPrimaryRootWindow())->GetFocusedWindow();
}
- ScopedVector<WindowSelectorItem>* GetWindowItems() {
- return &(ash::Shell::GetInstance()->window_selector_controller()->
- window_selector_->windows_);
+ const std::vector<WindowSelectorItem*>& GetWindowItemsForRoot(int index) {
+ return ash::Shell::GetInstance()->window_selector_controller()->
+ window_selector_->grid_list_[index]->window_list();
}
views::Widget* GetLabelWidget(ash::WindowSelectorItem* window) {
@@ -699,7 +700,7 @@ TEST_F(WindowSelectorTest, CreateLabelUnderWindow) {
base::string16 window_title = base::UTF8ToUTF16("My window");
window->set_title(window_title);
ToggleOverview();
- WindowSelectorItem* window_item = GetWindowItems()->back();
+ WindowSelectorItem* window_item = GetWindowItemsForRoot(0).back();
views::Widget* widget = GetLabelWidget(window_item);
// Has the label widget been created?
ASSERT_TRUE(widget);
@@ -728,7 +729,7 @@ TEST_F(WindowSelectorTest, CreateLabelUnderPanel) {
panel2->set_title(panel2_title);
wm::ActivateWindow(panel1.get());
ToggleOverview();
- WindowSelectorItem* window_item = GetWindowItems()->back();
+ WindowSelectorItem* window_item = GetWindowItemsForRoot(0).back();
views::Widget* widget = GetLabelWidget(window_item);
// Has the label widget been created?
ASSERT_TRUE(widget);
« ash/wm/overview/window_selector.cc ('K') | « ash/wm/overview/window_selector_item.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698