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

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

Issue 13139004: Deprecate Browser::TYPE_PANEL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 9 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/ash/launcher/browser_launcher_item_controller_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc
index 83b246e81122a34d1da5a3edc04daafc58d508c3..3adacc65d95f503ebd0a555ced5cfc396b50b9b2 100644
--- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc
@@ -291,51 +291,6 @@ TEST_F(BrowserLauncherItemControllerTest, TabbedSetup) {
}
}
-// Verifies Panels items work.
-TEST_F(BrowserLauncherItemControllerTest, PanelItem) {
- size_t initial_size = launcher_model_->items().size();
-
- // Add an App panel.
- {
- aura::Window window(NULL);
- TabHelperTabStripModelDelegate tab_strip_delegate;
- TabStripModel tab_strip(&tab_strip_delegate, profile());
- scoped_ptr<content::WebContents> panel_tab(CreateTestWebContents());
- app_tab_helper_->SetAppID(panel_tab.get(), "1"); // Panels are apps.
- tab_strip.InsertWebContentsAt(0,
- panel_tab.get(),
- TabStripModel::ADD_ACTIVE);
- BrowserLauncherItemController updater(
- LauncherItemController::TYPE_APP_PANEL,
- &window, &tab_strip, launcher_delegate_.get(),
- 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);
- TabHelperTabStripModelDelegate tab_strip_delegate;
- TabStripModel tab_strip(&tab_strip_delegate, profile());
- scoped_ptr<content::WebContents> panel_tab(CreateTestWebContents());
- app_tab_helper_->SetAppID(panel_tab.get(), "1"); // Panels are apps.
- tab_strip.InsertWebContentsAt(0,
- panel_tab.get(),
- TabStripModel::ADD_ACTIVE);
- BrowserLauncherItemController updater(
- LauncherItemController::TYPE_EXTENSION_PANEL,
- &window, &tab_strip, launcher_delegate_.get(),
- std::string());
- updater.Init();
- ASSERT_EQ(initial_size + 1, launcher_model_->items().size());
- EXPECT_EQ(ash::TYPE_PLATFORM_APP, 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();

Powered by Google App Engine
This is Rietveld 408576698