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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

Issue 2696133009: Disable ShelfAppBrowserTest.TabDragAndDrop (Closed)
Patch Set: Created 3 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_impl.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "ash/common/shelf/app_list_button.h" 9 #include "ash/common/shelf/app_list_button.h"
10 #include "ash/common/shelf/shelf_button.h" 10 #include "ash/common/shelf/shelf_button.h"
(...skipping 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status); 1058 EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status);
1059 1059
1060 // Navigate back. 1060 // Navigate back.
1061 ui_test_utils::NavigateToURL( 1061 ui_test_utils::NavigateToURL(
1062 browser(), GURL("http://www.example.com/path1/foo.html")); 1062 browser(), GURL("http://www.example.com/path1/foo.html"));
1063 EXPECT_EQ(ash::STATUS_ACTIVE, (*model_->ItemByID(shortcut_id)).status); 1063 EXPECT_EQ(ash::STATUS_ACTIVE, (*model_->ItemByID(shortcut_id)).status);
1064 } 1064 }
1065 1065
1066 // Confirm that a tab can be moved between browsers while maintaining the 1066 // Confirm that a tab can be moved between browsers while maintaining the
1067 // correct running state. 1067 // correct running state.
1068 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, TabDragAndDrop) { 1068 // Disabled due to flake: crbug.com/693341.
1069 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, DISABLED_TabDragAndDrop) {
1069 TabStripModel* tab_strip_model1 = browser()->tab_strip_model(); 1070 TabStripModel* tab_strip_model1 = browser()->tab_strip_model();
1070 EXPECT_EQ(1, tab_strip_model1->count()); 1071 EXPECT_EQ(1, tab_strip_model1->count());
1071 int browser_index = GetIndexOfShelfItemType(ash::TYPE_BROWSER_SHORTCUT); 1072 int browser_index = GetIndexOfShelfItemType(ash::TYPE_BROWSER_SHORTCUT);
1072 EXPECT_TRUE(browser_index >= 0); 1073 EXPECT_TRUE(browser_index >= 0);
1073 EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); 1074 EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
1074 1075
1075 // Create a shortcut for app1. 1076 // Create a shortcut for app1.
1076 ash::ShelfID shortcut_id = CreateShortcut("app1"); 1077 ash::ShelfID shortcut_id = CreateShortcut("app1");
1077 EXPECT_EQ(ash::STATUS_ACTIVE, model_->items()[browser_index].status); 1078 EXPECT_EQ(ash::STATUS_ACTIVE, model_->items()[browser_index].status);
1078 EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status); 1079 EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status);
(...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after
2391 2392
2392 // Close all windows via the menu item. 2393 // Close all windows via the menu item.
2393 CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE); 2394 CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
2394 EXPECT_EQ(0u, BrowserList::GetInstance()->size()); 2395 EXPECT_EQ(0u, BrowserList::GetInstance()->size());
2395 2396
2396 // Check if "Close" is removed from the context menu. 2397 // Check if "Close" is removed from the context menu.
2397 std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu(); 2398 std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
2398 ASSERT_FALSE( 2399 ASSERT_FALSE(
2399 IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE)); 2400 IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
2400 } 2401 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698