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

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

Issue 2618773002: Disables ShelfAppBrowserTestWithMultiMonitor.BasicDragAndDrop (Closed)
Patch Set: Created 3 years, 11 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/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/shelf/app_list_button.h" 10 #include "ash/common/shelf/app_list_button.h"
(...skipping 1893 matching lines...) Expand 10 before | Expand all | Expand 10 after
1904 "800x800,801+0-800x800"); 1904 "800x800,801+0-800x800");
1905 } 1905 }
1906 1906
1907 private: 1907 private:
1908 1908
1909 DISALLOW_COPY_AND_ASSIGN(ShelfAppBrowserTestWithMultiMonitor); 1909 DISALLOW_COPY_AND_ASSIGN(ShelfAppBrowserTestWithMultiMonitor);
1910 }; 1910 };
1911 1911
1912 // Do basic drag and drop interaction tests between the application list and 1912 // Do basic drag and drop interaction tests between the application list and
1913 // the launcher in the secondary monitor. 1913 // the launcher in the secondary monitor.
1914 // TODO(msw): fix, http://crbug.com/678622.
1914 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestWithMultiMonitor, 1915 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestWithMultiMonitor,
1915 BasicDragAndDrop) { 1916 DISABLED_BasicDragAndDrop) {
1916 // Get a number of interfaces we need. 1917 // Get a number of interfaces we need.
1917 DCHECK_EQ(ash::Shell::GetAllRootWindows().size(), 2U); 1918 DCHECK_EQ(ash::Shell::GetAllRootWindows().size(), 2U);
1918 aura::Window* secondary_root_window = ash::Shell::GetAllRootWindows()[1]; 1919 aura::Window* secondary_root_window = ash::Shell::GetAllRootWindows()[1];
1919 ash::WmShelf* secondary_shelf = 1920 ash::WmShelf* secondary_shelf =
1920 ash::WmShelf::ForWindow(ash::WmWindowAura::Get(secondary_root_window)); 1921 ash::WmShelf::ForWindow(ash::WmWindowAura::Get(secondary_root_window));
1921 1922
1922 ui::test::EventGenerator generator(secondary_root_window, gfx::Point()); 1923 ui::test::EventGenerator generator(secondary_root_window, gfx::Point());
1923 ash::test::ShelfViewTestAPI test(secondary_shelf->GetShelfViewForTesting()); 1924 ash::test::ShelfViewTestAPI test(secondary_shelf->GetShelfViewForTesting());
1924 AppListService* service = AppListService::Get(); 1925 AppListService* service = AppListService::Get();
1925 1926
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
2419 2420
2420 // Close all windows via the menu item. 2421 // Close all windows via the menu item.
2421 CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE); 2422 CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
2422 EXPECT_EQ(0u, BrowserList::GetInstance()->size()); 2423 EXPECT_EQ(0u, BrowserList::GetInstance()->size());
2423 2424
2424 // Check if "Close" is removed from the context menu. 2425 // Check if "Close" is removed from the context menu.
2425 std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu(); 2426 std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
2426 ASSERT_FALSE( 2427 ASSERT_FALSE(
2427 IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE)); 2428 IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
2428 } 2429 }
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