ash/shelf/shelf_window_watcher_unittest.cc - Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/shelf/shelf_window_watcher_unittest.cc

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix broken relative include. Created 4 years, 6 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 unified diff | Download patch

« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/shelf/shelf_window_watcher.h"	5 #include "ash/shelf/shelf_window_watcher.h"

6	6

7 #include "ash/ash_switches.h"

8 #include "ash/aura/wm_window_aura.h"	7 #include "ash/aura/wm_window_aura.h"

	8 #include "ash/common/ash_switches.h"

9 #include "ash/common/shelf/shelf_item_types.h"	9 #include "ash/common/shelf/shelf_item_types.h"

10 #include "ash/common/shelf/shelf_model.h"	10 #include "ash/common/shelf/shelf_model.h"

11 #include "ash/common/shell_window_ids.h"	11 #include "ash/common/shell_window_ids.h"

12 #include "ash/common/wm/window_resizer.h"	12 #include "ash/common/wm/window_resizer.h"

13 #include "ash/common/wm/window_state.h"	13 #include "ash/common/wm/window_state.h"

14 #include "ash/shelf/shelf_util.h"	14 #include "ash/shelf/shelf_util.h"

15 #include "ash/shell.h"	15 #include "ash/shell.h"

16 #include "ash/test/ash_test_base.h"	16 #include "ash/test/ash_test_base.h"

17 #include "ash/test/shell_test_api.h"	17 #include "ash/test/shell_test_api.h"

18 #include "ash/wm/window_state_aura.h"	18 #include "ash/wm/window_state_aura.h"

(...skipping 258 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
277 // container before fininshing the dragging.	277 // container before fininshing the dragging.

278 EXPECT_TRUE(wm::GetWindowState(window.get())->is_dragged());	278 EXPECT_TRUE(wm::GetWindowState(window.get())->is_dragged());

279 new_parent->AddChild(window.get());	279 new_parent->AddChild(window.get());

280 EXPECT_EQ(1, model_->item_count());	280 EXPECT_EQ(1, model_->item_count());

281 }	281 }

282 EXPECT_FALSE(wm::GetWindowState(window.get())->is_dragged());	282 EXPECT_FALSE(wm::GetWindowState(window.get())->is_dragged());

283 EXPECT_EQ(1, model_->item_count());	283 EXPECT_EQ(1, model_->item_count());

284 }	284 }

285	285

286 } // namespace ash	286 } // namespace ash

OLD	NEW