Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 84 insertions, 0 deletions

diff --git a/chromium/ash/wm/mru_window_tracker_unittest.cc b/chromium/ash/wm/mru_window_tracker_unittest.cc
new file mode 100644
index 00000000000..924060db7b5
--- /dev/null
+++ b/chromium/ash/wm/mru_window_tracker_unittest.cc
@@ -0,0 +1,84 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/shell.h"
+#include "ash/test/ash_test_base.h"
+#include "ash/test/test_shelf_delegate.h"
+#include "ash/wm/mru_window_tracker.h"
+#include "ash/wm/window_state.h"
+#include "ash/wm/window_util.h"
+#include "base/compiler_specific.h"
+#include "ui/aura/test/test_window_delegate.h"
+#include "ui/aura/window.h"
+
+namespace ash {
+namespace internal {
+
+class MruWindowTrackerTest : public test::AshTestBase {
+ public:
+  MruWindowTrackerTest() {}
+  virtual ~MruWindowTrackerTest() {}
+
+  aura::Window* CreateWindow() {
+    return CreateTestWindowInShellWithBounds(gfx::Rect(0, 0, 400, 400));
+  }
+
+  ash::MruWindowTracker* mru_window_tracker() {
+    return Shell::GetInstance()->mru_window_tracker();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MruWindowTrackerTest);
+};
+
+// Basic test that the activation order is tracked.
+TEST_F(MruWindowTrackerTest, Basic) {
+  scoped_ptr<aura::Window> w1(CreateWindow());
+  scoped_ptr<aura::Window> w2(CreateWindow());
+  scoped_ptr<aura::Window> w3(CreateWindow());
+  wm::ActivateWindow(w3.get());
+  wm::ActivateWindow(w2.get());
+  wm::ActivateWindow(w1.get());
+
+  MruWindowTracker::WindowList window_list =
+      mru_window_tracker()->BuildMruWindowList();
+  EXPECT_EQ(w1.get(), window_list[0]);
+  EXPECT_EQ(w2.get(), window_list[1]);
+  EXPECT_EQ(w3.get(), window_list[2]);
+}
+
+// Test that minimized windows are considered least recently used (but kept in
+// correct relative order).
+TEST_F(MruWindowTrackerTest, MinimizedWindowsAreLru) {
+  scoped_ptr<aura::Window> w1(CreateWindow());
+  scoped_ptr<aura::Window> w2(CreateWindow());
+  scoped_ptr<aura::Window> w3(CreateWindow());
+  scoped_ptr<aura::Window> w4(CreateWindow());
+  scoped_ptr<aura::Window> w5(CreateWindow());
+  scoped_ptr<aura::Window> w6(CreateWindow());
+  wm::ActivateWindow(w6.get());
+  wm::ActivateWindow(w5.get());
+  wm::ActivateWindow(w4.get());
+  wm::ActivateWindow(w3.get());
+  wm::ActivateWindow(w2.get());
+  wm::ActivateWindow(w1.get());
+
+  wm::GetWindowState(w1.get())->Minimize();
+  wm::GetWindowState(w4.get())->Minimize();
+  wm::GetWindowState(w5.get())->Minimize();
+
+  // Expect the relative order of minimized windows to remain the same, but all
+  // minimized windows to be at the end of the list.
+  MruWindowTracker::WindowList window_list =
+      mru_window_tracker()->BuildMruWindowList();
+  EXPECT_EQ(w2.get(), window_list[0]);
+  EXPECT_EQ(w3.get(), window_list[1]);
+  EXPECT_EQ(w6.get(), window_list[2]);
+  EXPECT_EQ(w1.get(), window_list[3]);
+  EXPECT_EQ(w4.get(), window_list[4]);
+  EXPECT_EQ(w5.get(), window_list[5]);
+}
+
+}  // namespace internal
+}  // namespace ash