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

Unified Diff: ash/launcher/launcher_view_unittest.cc

Issue 10386212: Add new attention state to launcher (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
Index: ash/launcher/launcher_view_unittest.cc
diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc
index 32b7b892f138e16310f67331194e3986c99692df..9342ec635b838152c2a9f8ee7acaef57c5d14db5 100644
--- a/ash/launcher/launcher_view_unittest.cc
+++ b/ash/launcher/launcher_view_unittest.cc
@@ -203,6 +203,11 @@ class LauncherViewTest : public aura::test::AuraTestBase {
return test_api_->GetButton(index);
}
+ LauncherItem GetItemByID(LauncherID id) {
+ LauncherItems::const_iterator items = model_->ItemByID(id);
+ return *items;
+ }
+
void CheckModelIDs(
const std::vector<std::pair<LauncherID, views::View*> >& id_map) {
ASSERT_EQ(static_cast<int>(id_map.size()), test_api_->GetButtonCount());
@@ -406,5 +411,24 @@ TEST_F(LauncherViewTest, ModelChangesWhileDragging) {
button_host->MouseReleasedOnButton(dragged_button, false);
}
+// Confirm that item status changes are reflected in the buttons.
+TEST_F(LauncherViewTest, LauncherItemStatus) {
+ ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
+ test_api_->GetButtonCount());
+
+ // Add tabbed browser.
+ LauncherID last_added = AddTabbedBrowser();
+ LauncherItem item = GetItemByID(last_added);
+ int index = model_->ItemIndexByID(last_added);
+ internal::LauncherButton* button = GetButtonByID(last_added);
+ ASSERT_EQ(internal::LauncherButton::STATE_RUNNING, button->state());
+ item.status = ash::STATUS_ACTIVE;
+ model_->Set(index, item);
+ ASSERT_EQ(internal::LauncherButton::STATE_ACTIVE, button->state());
+ item.status = ash::STATUS_ATTENTION;
+ model_->Set(index, item);
+ ASSERT_EQ(internal::LauncherButton::STATE_ATTENTION, button->state());
+}
+
} // namespace test
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698