chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2761373002: Move yet more from WmShell to Shell

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 2761373002: Move yet more from WmShell to Shell (Closed)

Patch Set: merge Created 3 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.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 9d6c8ea25697c70f1dca9fbad3aca892f3c394c9..af53acfb2e00a4f2e8241b599b0c92815bedbcc3 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

@@ -233,7 +233,7 @@ class LauncherPlatformAppBrowserTest

return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();

}

- ash::ShelfModel* shelf_model() { return ash::WmShell::Get()->shelf_model(); }

+ ash::ShelfModel* shelf_model() { return ash::Shell::Get()->shelf_model(); }

ash::ShelfID CreateAppShortcutLauncherItem(

const ash::AppLaunchId& app_launch_id) {

@@ -287,7 +287,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {

shelf_ =

ash::WmShelf::ForWindow(ash::WmShell::Get()->GetPrimaryRootWindow());

- model_ = ash::WmShell::Get()->shelf_model();

+ model_ = ash::Shell::Get()->shelf_model();

controller_ = GetChromeLauncherControllerImpl();

ASSERT_TRUE(controller_);

return ExtensionBrowserTest::RunTestOnMainThreadLoop();

@@ -1562,7 +1562,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, WindowAttentionStatus) {

IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest,

ShowInShelfWindowsWithWindowKeySet) {

- ash::ShelfModel* shelf_model = ash::WmShell::Get()->shelf_model();

+ ash::ShelfModel* shelf_model = ash::Shell::Get()->shelf_model();

// Add a window with shelf True, close it

int item_count = shelf_model->item_count();

@@ -2277,7 +2277,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, V1AppNavigation) {

IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, SettingsWindow) {

chrome::SettingsWindowManager* settings_manager =

chrome::SettingsWindowManager::GetInstance();

- ash::ShelfModel* shelf_model = ash::WmShell::Get()->shelf_model();

+ ash::ShelfModel* shelf_model = ash::Shell::Get()->shelf_model();

// Get the number of items in the shelf and browser menu.

int item_count = shelf_model->item_count();