OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/public/cpp/shelf_item_delegate.h" | 5 #include "ash/public/cpp/shelf_item_delegate.h" |
6 #include "ash/shelf/shelf_model.h" | 6 #include "ash/shelf/shelf_model.h" |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/wm/window_util.h" | 8 #include "ash/wm/window_util.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
13 #include "chrome/browser/chromeos/arc/arc_auth_notification.h" | 13 #include "chrome/browser/chromeos/arc/arc_auth_notification.h" |
14 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" | 14 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" |
15 #include "chrome/browser/chromeos/arc/arc_session_manager.h" | 15 #include "chrome/browser/chromeos/arc/arc_session_manager.h" |
16 #include "chrome/browser/chromeos/arc/arc_util.h" | 16 #include "chrome/browser/chromeos/arc/arc_util.h" |
17 #include "chrome/browser/extensions/extension_browsertest.h" | 17 #include "chrome/browser/extensions/extension_browsertest.h" |
| 18 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" |
18 #include "chrome/browser/ui/app_list/app_list_service.h" | 19 #include "chrome/browser/ui/app_list/app_list_service.h" |
19 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" | 20 #include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
20 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" | 21 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" |
21 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" | 22 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" |
22 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" | 23 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h" |
23 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h" | 24 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h" |
24 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h" | 25 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h" |
25 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 26 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
26 #include "components/arc/arc_util.h" | 27 #include "components/arc/arc_util.h" |
27 #include "content/public/test/browser_test_utils.h" | 28 #include "content/public/test/browser_test_utils.h" |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
542 app_host()->OnTaskDestroyed(2); | 543 app_host()->OnTaskDestroyed(2); |
543 EXPECT_EQ(delegate2, GetShelfItemDelegate(shelf_id2)); | 544 EXPECT_EQ(delegate2, GetShelfItemDelegate(shelf_id2)); |
544 // Destroy task #2, this kills shelf group 2 | 545 // Destroy task #2, this kills shelf group 2 |
545 app_host()->OnTaskDestroyed(3); | 546 app_host()->OnTaskDestroyed(3); |
546 EXPECT_FALSE(GetShelfItemDelegate(shelf_id2)); | 547 EXPECT_FALSE(GetShelfItemDelegate(shelf_id2)); |
547 | 548 |
548 // Disable ARC, this removes app and as result kills shelf group 3. | 549 // Disable ARC, this removes app and as result kills shelf group 3. |
549 arc::SetArcPlayStoreEnabledForProfile(profile(), false); | 550 arc::SetArcPlayStoreEnabledForProfile(profile(), false); |
550 EXPECT_FALSE(GetShelfItemDelegate(shelf_id3)); | 551 EXPECT_FALSE(GetShelfItemDelegate(shelf_id3)); |
551 } | 552 } |
OLD | NEW |