chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.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/launcher_context_menu_unittest.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: move files, cleanup 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

« ash/shell.cc ('K') | « chrome/browser/ui/ash/launcher/extension_launcher_context_menu.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/launcher_context_menu_unittest.cc

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

index f768df800c37a31f70012e4c392b3aeb7a10ab7c..30612e09e78227ad588723819a66642855d39659 100644

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

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

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

#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

-#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "base/macros.h"

#include "chrome/app/chrome_command_ids.h"

@@ -37,7 +36,7 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {

arc_test_.SetUp(profile_.get());

ash::test::AshTestBase::SetUp();

controller_.reset(new ChromeLauncherControllerImpl(

- profile(), ash::Shell::GetInstance()->shelf_model()));

+ profile(), ash::WmShell::Get()->shelf_model()));

controller_->Init();

}