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 <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "chrome/browser/extensions/test_extension_system.h" | 25 #include "chrome/browser/extensions/test_extension_system.h" |
26 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 26 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
27 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h" | 27 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h" |
28 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" | 28 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h" |
29 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" | 29 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.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_finder.h" | 32 #include "chrome/browser/ui/browser_finder.h" |
33 #include "chrome/browser/ui/browser_list.h" | 33 #include "chrome/browser/ui/browser_list.h" |
34 #include "chrome/browser/ui/browser_tabstrip.h" | 34 #include "chrome/browser/ui/browser_tabstrip.h" |
35 #include "chrome/browser/ui/host_desktop.h" | |
36 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 35 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
37 #include "chrome/common/extensions/extension_constants.h" | 36 #include "chrome/common/extensions/extension_constants.h" |
38 #include "chrome/common/pref_names.h" | 37 #include "chrome/common/pref_names.h" |
39 #include "chrome/test/base/browser_with_test_window_test.h" | 38 #include "chrome/test/base/browser_with_test_window_test.h" |
40 #include "chrome/test/base/testing_pref_service_syncable.h" | 39 #include "chrome/test/base/testing_pref_service_syncable.h" |
41 #include "chrome/test/base/testing_profile.h" | 40 #include "chrome/test/base/testing_profile.h" |
42 #include "content/public/browser/web_contents.h" | 41 #include "content/public/browser/web_contents.h" |
43 #include "extensions/common/extension.h" | 42 #include "extensions/common/extension.h" |
44 #include "extensions/common/manifest_constants.h" | 43 #include "extensions/common/manifest_constants.h" |
45 #include "testing/gtest/include/gtest/gtest.h" | 44 #include "testing/gtest/include/gtest/gtest.h" |
46 #include "ui/aura/client/window_tree_client.h" | 45 #include "ui/aura/client/window_tree_client.h" |
47 #include "ui/base/models/menu_model.h" | 46 #include "ui/base/models/menu_model.h" |
| 47 #include "ui/gfx/host_desktop_type.h" |
48 | 48 |
49 #if defined(OS_CHROMEOS) | 49 #if defined(OS_CHROMEOS) |
50 #include "ash/test/test_session_state_delegate.h" | 50 #include "ash/test/test_session_state_delegate.h" |
51 #include "ash/test/test_shell_delegate.h" | 51 #include "ash/test/test_shell_delegate.h" |
52 #include "chrome/browser/apps/scoped_keep_alive.h" | 52 #include "chrome/browser/apps/scoped_keep_alive.h" |
53 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" | 53 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" |
54 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 54 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
55 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 55 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
56 #include "chrome/browser/ui/apps/chrome_app_delegate.h" | 56 #include "chrome/browser/ui/apps/chrome_app_delegate.h" |
57 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" | 57 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" |
(...skipping 2610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2668 | 2668 |
2669 EXPECT_EQ(1, app_icon_loader->fetch_count()); | 2669 EXPECT_EQ(1, app_icon_loader->fetch_count()); |
2670 ASSERT_EQ(initial_size + 1, model_->items().size()); | 2670 ASSERT_EQ(initial_size + 1, model_->items().size()); |
2671 EXPECT_TRUE(launcher_controller_->IsAppPinned("1")); | 2671 EXPECT_TRUE(launcher_controller_->IsAppPinned("1")); |
2672 EXPECT_FALSE(launcher_controller_->IsAppPinned("0")); | 2672 EXPECT_FALSE(launcher_controller_->IsAppPinned("0")); |
2673 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type); | 2673 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type); |
2674 | 2674 |
2675 launcher_controller_->UnpinAppWithID("1"); | 2675 launcher_controller_->UnpinAppWithID("1"); |
2676 ASSERT_EQ(initial_size, model_->items().size()); | 2676 ASSERT_EQ(initial_size, model_->items().size()); |
2677 } | 2677 } |
OLD | NEW |