chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 23003004: Move apps tests from c/b/extensions to c/b/apps and refine DEPS.

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

Issue 23003004: Move apps tests from c/b/extensions to c/b/apps and refine DEPS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Correct ordering in typi Created 7 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"	5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

6	6

7 #include "apps/native_app_window.h"	7 #include "apps/native_app_window.h"

8 #include "apps/shell_window.h"	8 #include "apps/shell_window.h"

9 #include "apps/shell_window_registry.h"	9 #include "apps/shell_window_registry.h"

10 #include "ash/ash_switches.h"	10 #include "ash/ash_switches.h"

11 #include "ash/launcher/launcher.h"	11 #include "ash/launcher/launcher.h"

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

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

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

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

16 #include "ash/wm/window_util.h"	16 #include "ash/wm/window_util.h"

17 #include "base/command_line.h"	17 #include "base/command_line.h"

18 #include "base/strings/stringprintf.h"	18 #include "base/strings/stringprintf.h"

19 #include "base/strings/utf_string_conversions.h"	19 #include "base/strings/utf_string_conversions.h"

	20 #include "chrome/browser/apps/app_browsertest_util.h"

20 #include "chrome/browser/automation/automation_util.h"	21 #include "chrome/browser/automation/automation_util.h"

21 #include "chrome/browser/chrome_notification_types.h"	22 #include "chrome/browser/chrome_notification_types.h"

22 #include "chrome/browser/extensions/extension_apitest.h"	23 #include "chrome/browser/extensions/extension_apitest.h"

23 #include "chrome/browser/extensions/extension_browsertest.h"	24 #include "chrome/browser/extensions/extension_browsertest.h"

24 #include "chrome/browser/extensions/extension_function_test_utils.h"	25 #include "chrome/browser/extensions/extension_function_test_utils.h"

25 #include "chrome/browser/extensions/extension_service.h"	26 #include "chrome/browser/extensions/extension_service.h"

26 #include "chrome/browser/extensions/extension_system.h"	27 #include "chrome/browser/extensions/extension_system.h"

27 #include "chrome/browser/extensions/extension_test_message_listener.h"	28 #include "chrome/browser/extensions/extension_test_message_listener.h"

28 #include "chrome/browser/extensions/platform_app_browsertest_util.h"

29 #include "chrome/browser/profiles/profile.h"	29 #include "chrome/browser/profiles/profile.h"

30 #include "chrome/browser/ui/browser.h"	30 #include "chrome/browser/ui/browser.h"

31 #include "chrome/browser/ui/browser_commands.h"	31 #include "chrome/browser/ui/browser_commands.h"

32 #include "chrome/browser/ui/browser_window.h"	32 #include "chrome/browser/ui/browser_window.h"

33 #include "chrome/browser/ui/extensions/application_launch.h"	33 #include "chrome/browser/ui/extensions/application_launch.h"

34 #include "chrome/browser/ui/host_desktop.h"	34 #include "chrome/browser/ui/host_desktop.h"

35 #include "chrome/browser/ui/tabs/tab_strip_model.h"	35 #include "chrome/browser/ui/tabs/tab_strip_model.h"

36 #include "chrome/common/chrome_switches.h"	36 #include "chrome/common/chrome_switches.h"

37 #include "chrome/common/extensions/extension_constants.h"	37 #include "chrome/common/extensions/extension_constants.h"

38 #include "chrome/test/base/ui_test_utils.h"	38 #include "chrome/test/base/ui_test_utils.h"

(...skipping 789 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
828 EXPECT_TRUE(launcher_->IsShowingOverflowBubble());	828 EXPECT_TRUE(launcher_->IsShowingOverflowBubble());

829	829

830 // Unpin first pinned app and there should be no crash.	830 // Unpin first pinned app and there should be no crash.

831 ChromeLauncherController* controller =	831 ChromeLauncherController* controller =

832 static_cast<ChromeLauncherController*>(launcher_->delegate());	832 static_cast<ChromeLauncherController*>(launcher_->delegate());

833 controller->UnpinAppsWithID(std::string("fake_app_0"));	833 controller->UnpinAppsWithID(std::string("fake_app_0"));

834	834

835 test.RunMessageLoopUntilAnimationsDone();	835 test.RunMessageLoopUntilAnimationsDone();

836 EXPECT_FALSE(launcher_->IsShowingOverflowBubble());	836 EXPECT_FALSE(launcher_->IsShowingOverflowBubble());

837 }	837 }

OLD	NEW