chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2237903003: mash: Migrate Shelf aura::Window uses to WmWindow.

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 2237903003: mash: Migrate Shelf aura::Window uses to WmWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move shelf notify functions to WmShell. Created 4 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc ('k') | chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc » ('j') | no next file with comments »
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 9a4ef82c802a52960f7f1477a7d7985516eb73ea..4af3bfbee8d138e82ac395ab4d235814999cf608 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

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

#include <stddef.h>

+#include "ash/aura/wm_window_aura.h"

#include "ash/common/ash_switches.h"

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

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

@@ -376,7 +377,8 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {

int index = model_->GetItemIndexForType(ash::TYPE_BROWSER_SHORTCUT);

DCHECK_GE(index, 0);

ash::ShelfItem item = model_->items()[index];

- ash::Shelf* shelf = ash::Shelf::ForWindow(CurrentContext());

+ ash::Shelf* shelf =

+ ash::Shelf::ForWindow(ash::WmWindowAura::Get(CurrentContext()));

std::unique_ptr<LauncherContextMenu> menu(LauncherContextMenu::Create(

controller_, &item, ash::test::ShelfTestAPI(shelf).wm_shelf()));

return menu;

@@ -1898,7 +1900,8 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestWithMultiMonitor,

// Get a number of interfaces we need.

DCHECK_EQ(ash::Shell::GetAllRootWindows().size(), 2U);

aura::Window* secondary_root_window = ash::Shell::GetAllRootWindows()[1];

- ash::Shelf* secondary_shelf = ash::Shelf::ForWindow(secondary_root_window);

+ ash::Shelf* secondary_shelf =

+ ash::Shelf::ForWindow(ash::WmWindowAura::Get(secondary_root_window));

ui::test::EventGenerator generator(secondary_root_window, gfx::Point());

ash::test::ShelfViewTestAPI test(