Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4430)

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

Issue 2322683003: [Merge-M54] arc: Add support of default and OEM apps. (Closed)
Patch Set: Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
index d4c3e79f6534f60190adee3c8b48831df23e9a02..1275526104d3c1789c2425b0d65fa889550a1a86 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
@@ -48,9 +48,11 @@
#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
#include "chrome/browser/ui/app_list/arc/arc_app_test.h"
#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
+#include "chrome/browser/ui/app_list/arc/arc_default_app_list.h"
#include "chrome/browser/ui/apps/chrome_app_delegate.h"
#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
+#include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
#include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
@@ -3624,6 +3626,22 @@ class ChromeLauncherControllerOrientationTest
DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerOrientationTest);
};
+class ChromeLauncherControllerArcDefaultAppsTest
+ : public ChromeLauncherControllerImplTest {
+ public:
+ ChromeLauncherControllerArcDefaultAppsTest() {}
+ ~ChromeLauncherControllerArcDefaultAppsTest() override {}
+
+ protected:
+ void SetUp() override {
+ ArcDefaultAppList::UseTestAppsDirectory();
+ ChromeLauncherControllerImplTest::SetUp();
+ }
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerArcDefaultAppsTest);
+};
+
} // namespace
TEST_F(ChromeLauncherControllerOrientationTest, ArcOrientationLock) {
@@ -3785,3 +3803,39 @@ TEST_F(ChromeLauncherControllerOrientationTest, CurrentWithLandscapeDisplay) {
EXPECT_EQ(display::Display::ROTATE_0,
display::Screen::GetScreen()->GetPrimaryDisplay().rotation());
}
+
+TEST_F(ChromeLauncherControllerArcDefaultAppsTest, DefaultApps) {
+ arc_test_.SetUp(profile());
+ InitLauncherController();
+ ChromeLauncherController::set_instance(launcher_controller_.get());
+
+ ArcAppListPrefs* const prefs = arc_test_.arc_app_list_prefs();
+ EnableArc(false);
+ EXPECT_FALSE(arc_test_.arc_auth_service()->IsArcEnabled());
+ ASSERT_TRUE(prefs->GetAppIds().size());
+
+ const std::string app_id =
+ ArcAppTest::GetAppId(arc_test_.fake_default_apps()[0]);
+ EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(app_id));
+ EXPECT_TRUE(arc::LaunchApp(profile(), app_id));
+ EXPECT_TRUE(arc_test_.arc_auth_service()->IsArcEnabled());
+ EXPECT_NE(0, launcher_controller_->GetShelfIDForAppID(app_id));
+
+ // Stop Arc again. Shelf item should go away.
+ EnableArc(false);
+ EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(app_id));
+
+ EXPECT_TRUE(arc::LaunchApp(profile(), app_id));
+ EXPECT_TRUE(arc_test_.arc_auth_service()->IsArcEnabled());
+
+ EXPECT_NE(0, launcher_controller_->GetShelfIDForAppID(app_id));
+ EXPECT_TRUE(launcher_controller_->GetArcDeferredLauncher()->HasApp(app_id));
+
+ std::string window_app_id("org.chromium.arc.1");
+ CreateArcWindow(window_app_id);
+ arc_test_.app_instance()->SendTaskCreated(1,
+ arc_test_.fake_default_apps()[0]);
+
+ EXPECT_NE(0, launcher_controller_->GetShelfIDForAppID(app_id));
+ EXPECT_FALSE(launcher_controller_->GetArcDeferredLauncher()->HasApp(app_id));
+}
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698