| 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 "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" | |
| 8 #include "apps/shell_window.h" | 7 #include "apps/shell_window.h" |
| 9 #include "apps/shell_window_registry.h" | 8 #include "apps/shell_window_registry.h" |
| 9 #include "apps/ui/native_app_window.h" |
| 10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
| 11 #include "ash/display/display_controller.h" | 11 #include "ash/display/display_controller.h" |
| 12 #include "ash/launcher/launcher.h" | 12 #include "ash/launcher/launcher.h" |
| 13 #include "ash/launcher/launcher_button.h" | 13 #include "ash/launcher/launcher_button.h" |
| 14 #include "ash/launcher/launcher_model.h" | 14 #include "ash/launcher/launcher_model.h" |
| 15 #include "ash/launcher/launcher_view.h" | 15 #include "ash/launcher/launcher_view.h" |
| 16 #include "ash/shelf/shelf_util.h" | 16 #include "ash/shelf/shelf_util.h" |
| 17 #include "ash/shell.h" | 17 #include "ash/shell.h" |
| 18 #include "ash/test/launcher_test_api.h" | 18 #include "ash/test/launcher_test_api.h" |
| 19 #include "ash/test/launcher_view_test_api.h" | 19 #include "ash/test/launcher_view_test_api.h" |
| (...skipping 1858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1878 // Now show overflow bubble. | 1878 // Now show overflow bubble. |
| 1879 test.ShowOverflowBubble(); | 1879 test.ShowOverflowBubble(); |
| 1880 EXPECT_TRUE(launcher_->IsShowingOverflowBubble()); | 1880 EXPECT_TRUE(launcher_->IsShowingOverflowBubble()); |
| 1881 | 1881 |
| 1882 // Unpin first pinned app and there should be no crash. | 1882 // Unpin first pinned app and there should be no crash. |
| 1883 controller_->UnpinAppWithID(std::string("fake_app_0")); | 1883 controller_->UnpinAppWithID(std::string("fake_app_0")); |
| 1884 | 1884 |
| 1885 test.RunMessageLoopUntilAnimationsDone(); | 1885 test.RunMessageLoopUntilAnimationsDone(); |
| 1886 EXPECT_FALSE(launcher_->IsShowingOverflowBubble()); | 1886 EXPECT_FALSE(launcher_->IsShowingOverflowBubble()); |
| 1887 } | 1887 } |
| OLD | NEW |