chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2169533002: mash: Migrate shelf app list button to wm common types

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 2169533002: mash: Migrate shelf app list button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 5 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/chromeos/accessibility/sticky_keys_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/extension_launcher_context_menu.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 8838e34dfcfc2a1062362a321a6cb735cef700e0..31ffc23a7bba473f37978cbdcdff1b405ef45fa4 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

@@ -7,10 +7,11 @@

#include <stddef.h>

#include "ash/common/ash_switches.h"

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

#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/common/wm_shell.h"

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_button.h"

#include "ash/shelf/shelf_util.h"

@@ -271,7 +272,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {

void RunTestOnMainThreadLoop() override {

shelf_ = ash::Shelf::ForPrimaryDisplay();

- model_ = ash::test::ShellTestApi(ash::Shell::GetInstance()).shelf_model();

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

controller_ = GetChromeLauncherControllerImpl();

return ExtensionBrowserTest::RunTestOnMainThreadLoop();

}

@@ -1534,7 +1535,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, WindowAttentionStatus) {

IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest,

ShowInShelfWindowsWithWindowKeySet) {

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

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

// Add a window with shelf True, close it

int item_count = shelf_model->item_count();

@@ -2269,7 +2270,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::Shell::GetInstance()->shelf_model();

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

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

int item_count = shelf_model->item_count();