chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2070143003: Add MD ink drop ripple to app list button

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2070143003: Add MD ink drop ripple to app list button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b612539_shelf_button_ripple

Patch Set: Updated tests Created 4 years, 6 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

« ash/shelf/shelf_view_unittest.cc ('K') | « ash/sysui/app_list_presenter_mus.cc ('k') | ui/app_list/presenter/app_list_presenter.h » ('j') | ui/views/animation/test/ink_drop_host_view_test_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

index 89dc0871d41acaca83d84f0581ab9d540cd24c4f..ff38412bb7d3cec8de14b9290d152d4b53af8853 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

@@ -10,6 +10,7 @@

#include "ash/common/shelf/shelf_constants.h"

#include "ash/common/shelf/shelf_model.h"

#include "ash/common/wm/window_state.h"

+#include "ash/shelf/app_list_button.h"

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_button.h"

#include "ash/shelf/shelf_util.h"

@@ -1656,7 +1657,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, DISABLED_DragAndDrop) {

// Open the app list menu and check that the drag and drop host was set.

gfx::Rect app_list_bounds =

- test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();

+ test.shelf_view()->GetAppListButton()->GetBoundsInScreen();

generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),

app_list_bounds.CenterPoint().y());

base::RunLoop().RunUntilIdle();

@@ -1800,7 +1801,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestWithMultiMonitor,

// Open the app list menu and check that the drag and drop host was set.

gfx::Rect app_list_bounds =

- test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();

+ test.shelf_view()->GetAppListButton()->GetBoundsInScreen();

display::Display display =

display::Screen::GetScreen()->GetDisplayNearestWindow(

secondary_root_window);

@@ -1987,7 +1988,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ClickItem) {

// Open the app list menu and check that the drag and drop host was set.

gfx::Rect app_list_bounds =

- test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();

+ test.shelf_view()->GetAppListButton()->GetBoundsInScreen();

generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),

app_list_bounds.CenterPoint().y());

generator.ClickLeftButton();