ash/launcher/launcher_unittest.cc - Issue 23606016: Refactor LauncherItemController and LauncherItemDelegate

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/launcher/launcher_unittest.cc

Issue 23606016: Refactor LauncherItemController and LauncherItemDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix for unittest.. Created 7 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 unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/launcher/launcher.h"	5 #include "ash/launcher/launcher.h"

6 #include "ash/launcher/launcher_button.h"	6 #include "ash/launcher/launcher_button.h"

7 #include "ash/launcher/launcher_model.h"	7 #include "ash/launcher/launcher_model.h"

8 #include "ash/launcher/launcher_view.h"	8 #include "ash/launcher/launcher_view.h"

9

10 #include "ash/shelf/shelf_widget.h"	9 #include "ash/shelf/shelf_widget.h"

11 #include "ash/shell.h"	10 #include "ash/shell.h"

12 #include "ash/test/ash_test_base.h"	11 #include "ash/test/ash_test_base.h"

13 #include "ash/test/launcher_test_api.h"	12 #include "ash/test/launcher_test_api.h"

14 #include "ash/test/launcher_view_test_api.h"	13 #include "ash/test/launcher_view_test_api.h"

15 #include "ash/wm/window_util.h"	14 #include "ash/wm/window_util.h"

16 #include "ui/aura/root_window.h"	15 #include "ui/aura/root_window.h"

17 #include "ui/gfx/display.h"	16 #include "ui/gfx/display.h"

18 #include "ui/gfx/screen.h"	17 #include "ui/gfx/screen.h"

19 #include "ui/views/corewm/corewm_switches.h"	18 #include "ui/views/corewm/corewm_switches.h"

(...skipping 123 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
143 // Removes the first item in main launcher view.	142 // Removes the first item in main launcher view.

144 launcher_model()->RemoveItemAt(	143 launcher_model()->RemoveItemAt(

145 launcher_model()->ItemIndexByID(first_item_id));	144 launcher_model()->ItemIndexByID(first_item_id));

146	145

147 // Waits for all transitions to finish and there should be no crash.	146 // Waits for all transitions to finish and there should be no crash.

148 test_api()->RunMessageLoopUntilAnimationsDone();	147 test_api()->RunMessageLoopUntilAnimationsDone();

149 EXPECT_FALSE(launcher()->IsShowingOverflowBubble());	148 EXPECT_FALSE(launcher()->IsShowingOverflowBubble());

150 }	149 }

151	150

152 } // namespace ash	151 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/launcher/launcher_item_delegate_manager.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »