| 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 "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/launcher/launcher.h" | 8 #include "ash/launcher/launcher.h" |
| 9 #include "ash/launcher/launcher_model.h" | 9 #include "ash/launcher/launcher_model.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/test/launcher_view_test_api.h" | 11 #include "ash/test/launcher_view_test_api.h" |
| 12 #include "ash/test/shell_test_api.h" | 12 #include "ash/test/shell_test_api.h" |
| 13 #include "ash/wm/window_util.h" | 13 #include "ash/wm/window_util.h" |
| 14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 15 #include "base/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
| 16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
| 17 #include "chrome/browser/automation/automation_util.h" | 17 #include "chrome/browser/automation/automation_util.h" |
| 18 #include "chrome/browser/extensions/extension_apitest.h" | 18 #include "chrome/browser/extensions/extension_apitest.h" |
| 19 #include "chrome/browser/extensions/extension_browsertest.h" | 19 #include "chrome/browser/extensions/extension_browsertest.h" |
| 20 #include "chrome/browser/extensions/extension_function_test_utils.h" | 20 #include "chrome/browser/extensions/extension_function_test_utils.h" |
| 21 #include "chrome/browser/extensions/extension_service.h" | 21 #include "chrome/browser/extensions/extension_service.h" |
| 22 #include "chrome/browser/extensions/extension_system.h" | 22 #include "chrome/browser/extensions/extension_system.h" |
| 23 #include "chrome/browser/extensions/extension_test_message_listener.h" | 23 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 24 #include "chrome/browser/extensions/platform_app_browsertest_util.h" | 24 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
| 25 #include "chrome/browser/extensions/shell_window_registry.h" | 25 #include "chrome/browser/extensions/shell_window_registry.h" |
| (...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 843 EXPECT_TRUE(launcher_->IsShowingOverflowBubble()); | 843 EXPECT_TRUE(launcher_->IsShowingOverflowBubble()); |
| 844 | 844 |
| 845 // Unpin first pinned app and there should be no crash. | 845 // Unpin first pinned app and there should be no crash. |
| 846 ChromeLauncherController* controller = | 846 ChromeLauncherController* controller = |
| 847 static_cast<ChromeLauncherController*>(launcher_->delegate()); | 847 static_cast<ChromeLauncherController*>(launcher_->delegate()); |
| 848 controller->UnpinAppsWithID(std::string("fake_app_0")); | 848 controller->UnpinAppsWithID(std::string("fake_app_0")); |
| 849 | 849 |
| 850 test.RunMessageLoopUntilAnimationsDone(); | 850 test.RunMessageLoopUntilAnimationsDone(); |
| 851 EXPECT_FALSE(launcher_->IsShowingOverflowBubble()); | 851 EXPECT_FALSE(launcher_->IsShowingOverflowBubble()); |
| 852 } | 852 } |
| OLD | NEW |