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

Unified Diff: chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc

Issue 10855094: launcher: Remove old files and update DEPS whitelist. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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: chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc
diff --git a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc
deleted file mode 100644
index 0c4f1b3bba5f266809e306ae131f69112d602a91..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller_unittest.cc
+++ /dev/null
@@ -1,412 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h"
-
-#include <map>
-#include <string>
-
-#include "ash/launcher/launcher_model.h"
-#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h"
-#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
-#include "chrome/test/base/chrome_render_view_host_test_harness.h"
-#include "chrome/test/base/testing_profile.h"
-#include "content/public/test/test_browser_thread.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/client/activation_delegate.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/test/test_activation_client.h"
-#include "ui/aura/test/test_window_delegate.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_delegate.h"
-#include "ui/base/event.h"
-
-namespace {
-
-// Test implementation of AppTabHelper
-class AppTabHelperImpl : public ChromeLauncherController::AppTabHelper {
- public:
- AppTabHelperImpl() {}
- virtual ~AppTabHelperImpl() {}
-
- // Sets the id for the specified tab. The id is removed if Remove() is
- // invoked.
- void SetAppID(TabContents* tab, const std::string& id) {
- tab_id_map_[tab] = id;
- }
-
- // Returns true if there is an id registered for |tab|.
- bool HasAppID(TabContents* tab) const {
- return tab_id_map_.find(tab) != tab_id_map_.end();
- }
-
- // AppTabHelper implementation:
- virtual std::string GetAppID(TabContents* tab) OVERRIDE {
- return tab_id_map_.find(tab) != tab_id_map_.end() ? tab_id_map_[tab] :
- std::string();
- }
-
- virtual bool IsValidID(const std::string& id) OVERRIDE {
- for (TabToStringMap::const_iterator i = tab_id_map_.begin();
- i != tab_id_map_.end(); ++i) {
- if (i->second == id)
- return true;
- }
- return false;
- }
-
- private:
- typedef std::map<TabContents*, std::string> TabToStringMap;
-
- TabToStringMap tab_id_map_;
-
- DISALLOW_COPY_AND_ASSIGN(AppTabHelperImpl);
-};
-
-// Test implementation of AppIconLoader.
-class AppIconLoaderImpl : public ChromeLauncherController::AppIconLoader {
- public:
- AppIconLoaderImpl() : fetch_count_(0) {}
- virtual ~AppIconLoaderImpl() {}
-
- // Returns the number of times FetchImage() has been invoked and resets the
- // count to 0.
- int GetAndClearFetchCount() {
- int value = fetch_count_;
- fetch_count_ = 0;
- return value;
- }
-
- // AppIconLoader implementation:
- virtual void FetchImage(const std::string& id) OVERRIDE {
- fetch_count_++;
- }
-
- private:
- int fetch_count_;
-
- DISALLOW_COPY_AND_ASSIGN(AppIconLoaderImpl);
-};
-
-} // namespace
-
-class BrowserLauncherItemControllerTest :
- public ChromeRenderViewHostTestHarness {
- public:
- BrowserLauncherItemControllerTest()
- : browser_thread_(content::BrowserThread::UI, &message_loop_) {
- }
-
- virtual void SetUp() OVERRIDE {
- ChromeRenderViewHostTestHarness::SetUp();
-
- activation_client_.reset(
- new aura::test::TestActivationClient(root_window()));
- launcher_model_.reset(new ash::LauncherModel);
- launcher_delegate_.reset(
- new ChromeLauncherController(profile(), launcher_model_.get()));
- app_tab_helper_ = new AppTabHelperImpl;
- app_icon_loader_ = new AppIconLoaderImpl;
- launcher_delegate_->SetAppTabHelperForTest(app_tab_helper_);
- launcher_delegate_->SetAppIconLoaderForTest(app_icon_loader_);
- launcher_delegate_->Init();
- }
-
- virtual void TearDown() OVERRIDE {
- launcher_delegate_.reset();
- ChromeRenderViewHostTestHarness::TearDown();
- }
-
- protected:
- // Contains all the objects needed to create a BrowserLauncherItemController.
- struct State : public aura::client::ActivationDelegate {
- public:
- State(BrowserLauncherItemControllerTest* test,
- const std::string& app_id,
- BrowserLauncherItemController::Type launcher_type)
- : launcher_test(test),
- window(NULL),
- tab_strip(&tab_strip_delegate, test->profile()),
- updater(&window,
- &tab_strip,
- test->launcher_delegate_.get(),
- launcher_type,
- app_id) {
- window.Init(ui::LAYER_NOT_DRAWN);
- launcher_test->root_window()->AddChild(&window);
- launcher_test->activation_client_->ActivateWindow(&window);
- aura::client::SetActivationDelegate(&window, this);
- updater.Init();
- }
-
- ash::LauncherItem GetUpdaterItem() {
- ash::LauncherID launcher_id =
- BrowserLauncherItemController::TestApi(&updater).item_id();
- int index = launcher_test->launcher_model_->ItemIndexByID(launcher_id);
- return launcher_test->launcher_model_->items()[index];
- }
-
- // aura::client::ActivationDelegate overrides.
- virtual bool ShouldActivate(const ui::Event* event) OVERRIDE {
- return true;
- }
- virtual void OnActivated() OVERRIDE {
- updater.BrowserActivationStateChanged();
- }
- virtual void OnLostActive() OVERRIDE {
- updater.BrowserActivationStateChanged();
- }
-
- BrowserLauncherItemControllerTest* launcher_test;
- aura::Window window;
- TestTabStripModelDelegate tab_strip_delegate;
- TabStripModel tab_strip;
- BrowserLauncherItemController updater;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(State);
- };
-
- const std::string& GetAppID(ash::LauncherID id) const {
- return launcher_delegate_->id_to_item_map_[id].app_id;
- }
-
- void ResetAppTabHelper() {
- launcher_delegate_->SetAppTabHelperForTest(app_tab_helper_);
- }
-
- void ResetAppIconLoader() {
- launcher_delegate_->SetAppIconLoaderForTest(app_icon_loader_);
- }
-
- void UnpinAppsWithID(const std::string& app_id) {
- launcher_delegate_->UnpinAppsWithID(app_id);
- }
-
- const ash::LauncherItem& GetItem(BrowserLauncherItemController* updater) {
- int index = launcher_model_->ItemIndexByID(
- BrowserLauncherItemController::TestApi(updater).item_id());
- return launcher_model_->items()[index];
- }
-
- scoped_ptr<ash::LauncherModel> launcher_model_;
- scoped_ptr<ChromeLauncherController> launcher_delegate_;
-
- // Owned by BrowserLauncherItemController.
- AppTabHelperImpl* app_tab_helper_;
- AppIconLoaderImpl* app_icon_loader_;
-
- scoped_ptr<aura::test::TestActivationClient> activation_client_;
-
- private:
- content::TestBrowserThread browser_thread_;
- std::vector<State*> states;
-
- DISALLOW_COPY_AND_ASSIGN(BrowserLauncherItemControllerTest);
-};
-
-// Verifies a new launcher item is added for TYPE_TABBED.
-TEST_F(BrowserLauncherItemControllerTest, TabbedSetup) {
- size_t initial_size = launcher_model_->items().size();
- {
- TabContents tab_contents(CreateTestWebContents());
- State state(this, std::string(),
- BrowserLauncherItemController::TYPE_TABBED);
-
- // There should be one more item.
- ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
- // New item should be added at the end.
- EXPECT_EQ(ash::TYPE_TABBED, state.GetUpdaterItem().type);
- }
-
- // Deleting the BrowserLauncherItemController should have removed the item.
- ASSERT_EQ(initial_size, launcher_model_->items().size());
-
- // Do the same, but this time add the tab first.
- {
- TabContents tab_contents(CreateTestWebContents());
-
- TestTabStripModelDelegate tab_strip_delegate;
- TabStripModel tab_strip(&tab_strip_delegate, profile());
- tab_strip.InsertTabContentsAt(0, &tab_contents, TabStripModel::ADD_ACTIVE);
- aura::Window window(NULL);
- window.Init(ui::LAYER_NOT_DRAWN);
- root_window()->AddChild(&window);
- BrowserLauncherItemController updater(
- &window, &tab_strip, launcher_delegate_.get(),
- BrowserLauncherItemController::TYPE_TABBED, std::string());
- updater.Init();
-
- // There should be one more item.
- ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
- // New item should be added at the end.
- EXPECT_EQ(ash::TYPE_TABBED, GetItem(&updater).type);
- }
-}
-
-// Verifies Panels items work.
-TEST_F(BrowserLauncherItemControllerTest, PanelItem) {
- size_t initial_size = launcher_model_->items().size();
-
- // Add an App panel.
- {
- aura::Window window(NULL);
- TestTabStripModelDelegate tab_strip_delegate;
- TabStripModel tab_strip(&tab_strip_delegate, profile());
- TabContents panel_tab(CreateTestWebContents());
- app_tab_helper_->SetAppID(&panel_tab, "1"); // Panels are apps.
- tab_strip.InsertTabContentsAt(0, &panel_tab, TabStripModel::ADD_ACTIVE);
- BrowserLauncherItemController updater(
- &window, &tab_strip, launcher_delegate_.get(),
- BrowserLauncherItemController::TYPE_APP_PANEL, std::string());
- updater.Init();
- ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
- EXPECT_EQ(ash::TYPE_APP_PANEL, GetItem(&updater).type);
- EXPECT_EQ(static_cast<void*>(NULL), updater.favicon_loader_.get());
- }
-
- // Add an Extension panel.
- {
- aura::Window window(NULL);
- TestTabStripModelDelegate tab_strip_delegate;
- TabStripModel tab_strip(&tab_strip_delegate, profile());
- TabContents panel_tab(CreateTestWebContents());
- app_tab_helper_->SetAppID(&panel_tab, "1"); // Panels are apps.
- tab_strip.InsertTabContentsAt(0, &panel_tab, TabStripModel::ADD_ACTIVE);
- BrowserLauncherItemController updater(
- &window, &tab_strip, launcher_delegate_.get(),
- BrowserLauncherItemController::TYPE_EXTENSION_PANEL, std::string());
- updater.Init();
- ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
- EXPECT_EQ(ash::TYPE_APP_PANEL, GetItem(&updater).type);
- EXPECT_NE(static_cast<void*>(NULL), updater.favicon_loader_.get());
- }
-}
-
-// Verifies pinned apps are persisted and restored.
-TEST_F(BrowserLauncherItemControllerTest, PersistPinned) {
- size_t initial_size = launcher_model_->items().size();
- TabContents tab1(CreateTestWebContents());
-
- app_tab_helper_->SetAppID(&tab1, "1");
-
- app_icon_loader_->GetAndClearFetchCount();
- launcher_delegate_->PinAppWithID("1");
- EXPECT_GT(app_icon_loader_->GetAndClearFetchCount(), 0);
- EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
- launcher_model_->items()[1].type);
- EXPECT_TRUE(launcher_delegate_->IsAppPinned("1"));
- EXPECT_FALSE(launcher_delegate_->IsAppPinned("0"));
- EXPECT_EQ(initial_size + 1, launcher_model_->items().size());
-
- launcher_delegate_.reset(
- new ChromeLauncherController(profile(), launcher_model_.get()));
- app_tab_helper_ = new AppTabHelperImpl;
- app_tab_helper_->SetAppID(&tab1, "1");
- ResetAppTabHelper();
- app_icon_loader_ = new AppIconLoaderImpl;
- ResetAppIconLoader();
- launcher_delegate_->Init();
- EXPECT_GT(app_icon_loader_->GetAndClearFetchCount(), 0);
- ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
- EXPECT_TRUE(launcher_delegate_->IsAppPinned("1"));
- EXPECT_FALSE(launcher_delegate_->IsAppPinned("0"));
- EXPECT_EQ(ash::TYPE_APP_SHORTCUT,
- launcher_model_->items()[1].type);
-
- UnpinAppsWithID("1");
- ASSERT_EQ(initial_size, launcher_model_->items().size());
-}
-
-// Confirm that tabbed browsers handle activation correctly.
-TEST_F(BrowserLauncherItemControllerTest, ActivateBrowsers) {
- State state1(this, std::string(), BrowserLauncherItemController::TYPE_TABBED);
-
- // First browser is active.
- EXPECT_EQ(ash::STATUS_ACTIVE, state1.GetUpdaterItem().status);
-
- {
- // Both running.
- State state2(this, std::string(),
- BrowserLauncherItemController::TYPE_TABBED);
- EXPECT_EQ(ash::STATUS_ACTIVE, state2.GetUpdaterItem().status);
- EXPECT_EQ(ash::STATUS_RUNNING, state1.GetUpdaterItem().status);
-
- // Make first browser active again.
- activation_client_->ActivateWindow(&state1.window);
- EXPECT_EQ(ash::STATUS_ACTIVE, state1.GetUpdaterItem().status);
- EXPECT_EQ(ash::STATUS_RUNNING, state2.GetUpdaterItem().status);
-
- // And back to second.
- activation_client_->ActivateWindow(&state2.window);
- EXPECT_EQ(ash::STATUS_ACTIVE, state2.GetUpdaterItem().status);
- EXPECT_EQ(ash::STATUS_RUNNING, state1.GetUpdaterItem().status);
- }
-
- // First browser should be active again after second is closed.
- EXPECT_EQ(ash::STATUS_ACTIVE, state1.GetUpdaterItem().status);
-}
-
-// Confirm that window activation works through the model.
-TEST_F(BrowserLauncherItemControllerTest, SwitchDirectlyToApp) {
- State state1(this, std::string(),
- BrowserLauncherItemController::TYPE_TABBED);
- int index1 = launcher_model_->ItemIndexByID(state1.GetUpdaterItem().id);
-
- // Second app is active and first is inactive.
- State state2(this, std::string(),
- BrowserLauncherItemController::TYPE_TABBED);
- int index2 = launcher_model_->ItemIndexByID(state2.GetUpdaterItem().id);
-
- EXPECT_EQ(ash::STATUS_RUNNING, state1.GetUpdaterItem().status);
- EXPECT_EQ(ash::STATUS_ACTIVE, state2.GetUpdaterItem().status);
- EXPECT_EQ(&state2.window, activation_client_->GetActiveWindow());
-
- // Test that we can properly switch to the first item.
- ash::LauncherItem new_item1(launcher_model_->items()[index1]);
- new_item1.status = ash::STATUS_ACTIVE;
- launcher_model_->Set(index1, new_item1);
- EXPECT_EQ(ash::STATUS_ACTIVE, launcher_model_->items()[index1].status);
- EXPECT_EQ(ash::STATUS_RUNNING, launcher_model_->items()[index2].status);
- EXPECT_EQ(&state1.window, activation_client_->GetActiveWindow());
-
- // And to the second item active.
- ash::LauncherItem new_item2(launcher_model_->items()[index2]);
- new_item2.status = ash::STATUS_ACTIVE;
- launcher_model_->Set(index2, new_item2);
- EXPECT_EQ(ash::STATUS_RUNNING, launcher_model_->items()[index1].status);
- EXPECT_EQ(ash::STATUS_ACTIVE, launcher_model_->items()[index2].status);
- EXPECT_EQ(&state2.window, activation_client_->GetActiveWindow());
-}
-
-// Test attention states of windows.
-TEST_F(BrowserLauncherItemControllerTest, FlashWindow) {
- // App panel first
- State app_state(this, "1", BrowserLauncherItemController::TYPE_APP_PANEL);
- EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status);
-
- // Active windows don't show attention.
- app_state.window.SetProperty(aura::client::kDrawAttentionKey, true);
- EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status);
-
- // Then browser window
- State browser_state(
- this, std::string(), BrowserLauncherItemController::TYPE_TABBED);
- // First browser is active.
- EXPECT_EQ(ash::STATUS_ACTIVE, browser_state.GetUpdaterItem().status);
- EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status);
-
- // App window should go to attention state.
- app_state.window.SetProperty(aura::client::kDrawAttentionKey, true);
- EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status);
-
- // Activating app window should clear attention state.
- activation_client_->ActivateWindow(&app_state.window);
- EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status);
-}

Powered by Google App Engine
This is Rietveld 408576698