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

Unified Diff: components/mus/public/cpp/tests/window_unittest.cc

Issue 1406153004: components/mus/public/interfaces View => Window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yet another rebase Created 5 years, 2 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 | « components/mus/public/cpp/tests/window_server_test_base.cc ('k') | components/mus/public/cpp/window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/public/cpp/tests/window_unittest.cc
diff --git a/components/mus/public/cpp/tests/window_unittest.cc b/components/mus/public/cpp/tests/window_unittest.cc
index 870a02635bf7386fa17d0e6a5640b4e4d5d61f3b..ef067eafa35b93d3dde6a040836d9a2edfc20682 100644
--- a/components/mus/public/cpp/tests/window_unittest.cc
+++ b/components/mus/public/cpp/tests/window_unittest.cc
@@ -423,7 +423,7 @@ class OrderChangeObserver : public WindowObserver {
struct Change {
Window* window;
Window* relative_window;
- mojo::OrderDirection direction;
+ mojom::OrderDirection direction;
};
typedef std::vector<Change> Changes;
@@ -442,13 +442,13 @@ class OrderChangeObserver : public WindowObserver {
// Overridden from WindowObserver:
void OnWindowReordering(Window* window,
Window* relative_window,
- mojo::OrderDirection direction) override {
+ mojom::OrderDirection direction) override {
OnWindowReordered(window, relative_window, direction);
}
void OnWindowReordered(Window* window,
Window* relative_window,
- mojo::OrderDirection direction) override {
+ mojom::OrderDirection direction) override {
Change change;
change.window = window;
change.relative_window = relative_window;
@@ -488,11 +488,11 @@ TEST_F(WindowObserverTest, Order) {
ASSERT_EQ(2U, changes.size());
EXPECT_EQ(&w11, changes[0].window);
EXPECT_EQ(&w13, changes[0].relative_window);
- EXPECT_EQ(mojo::ORDER_DIRECTION_ABOVE, changes[0].direction);
+ EXPECT_EQ(mojom::ORDER_DIRECTION_ABOVE, changes[0].direction);
EXPECT_EQ(&w11, changes[1].window);
EXPECT_EQ(&w13, changes[1].relative_window);
- EXPECT_EQ(mojo::ORDER_DIRECTION_ABOVE, changes[1].direction);
+ EXPECT_EQ(mojom::ORDER_DIRECTION_ABOVE, changes[1].direction);
}
{
@@ -508,11 +508,11 @@ TEST_F(WindowObserverTest, Order) {
ASSERT_EQ(2U, changes.size());
EXPECT_EQ(&w11, changes[0].window);
EXPECT_EQ(&w12, changes[0].relative_window);
- EXPECT_EQ(mojo::ORDER_DIRECTION_BELOW, changes[0].direction);
+ EXPECT_EQ(mojom::ORDER_DIRECTION_BELOW, changes[0].direction);
EXPECT_EQ(&w11, changes[1].window);
EXPECT_EQ(&w12, changes[1].relative_window);
- EXPECT_EQ(mojo::ORDER_DIRECTION_BELOW, changes[1].direction);
+ EXPECT_EQ(mojom::ORDER_DIRECTION_BELOW, changes[1].direction);
}
{
@@ -520,7 +520,7 @@ TEST_F(WindowObserverTest, Order) {
// Move w11 above w12.
// Resulting order: w12. w11, w13
- w11.Reorder(&w12, mojo::ORDER_DIRECTION_ABOVE);
+ w11.Reorder(&w12, mojom::ORDER_DIRECTION_ABOVE);
EXPECT_EQ(&w12, w1.children().front());
EXPECT_EQ(&w13, w1.children().back());
@@ -528,11 +528,11 @@ TEST_F(WindowObserverTest, Order) {
ASSERT_EQ(2U, changes.size());
EXPECT_EQ(&w11, changes[0].window);
EXPECT_EQ(&w12, changes[0].relative_window);
- EXPECT_EQ(mojo::ORDER_DIRECTION_ABOVE, changes[0].direction);
+ EXPECT_EQ(mojom::ORDER_DIRECTION_ABOVE, changes[0].direction);
EXPECT_EQ(&w11, changes[1].window);
EXPECT_EQ(&w12, changes[1].relative_window);
- EXPECT_EQ(mojo::ORDER_DIRECTION_ABOVE, changes[1].direction);
+ EXPECT_EQ(mojom::ORDER_DIRECTION_ABOVE, changes[1].direction);
}
{
@@ -540,7 +540,7 @@ TEST_F(WindowObserverTest, Order) {
// Move w11 below w12.
// Resulting order: w11, w12, w13
- w11.Reorder(&w12, mojo::ORDER_DIRECTION_BELOW);
+ w11.Reorder(&w12, mojom::ORDER_DIRECTION_BELOW);
EXPECT_EQ(&w11, w1.children().front());
EXPECT_EQ(&w13, w1.children().back());
@@ -548,11 +548,11 @@ TEST_F(WindowObserverTest, Order) {
ASSERT_EQ(2U, changes.size());
EXPECT_EQ(&w11, changes[0].window);
EXPECT_EQ(&w12, changes[0].relative_window);
- EXPECT_EQ(mojo::ORDER_DIRECTION_BELOW, changes[0].direction);
+ EXPECT_EQ(mojom::ORDER_DIRECTION_BELOW, changes[0].direction);
EXPECT_EQ(&w11, changes[1].window);
EXPECT_EQ(&w12, changes[1].relative_window);
- EXPECT_EQ(mojo::ORDER_DIRECTION_BELOW, changes[1].direction);
+ EXPECT_EQ(mojom::ORDER_DIRECTION_BELOW, changes[1].direction);
}
}
« no previous file with comments | « components/mus/public/cpp/tests/window_server_test_base.cc ('k') | components/mus/public/cpp/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698