chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2808723004: Renames WmShell to ShellPort

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 2808723004: Renames WmShell to ShellPort (Closed)

Patch Set: feedback Created 3 years, 8 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/launcher/chrome_launcher_controller_impl_unittest.cc » ('j') | chrome/browser/ui/webui/options/browser_options_handler.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 93d3bc905823046dae33f1324842c1fab875dd8c..f7a63ac7f9ff9925e532759b9c8b9d4c61dfa971 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

@@ -17,12 +17,12 @@

#include "ash/shelf/shelf_widget.h"

#include "ash/shelf/wm_shelf.h"

#include "ash/shell.h"

+#include "ash/shell_port.h"

#include "ash/test/shelf_view_test_api.h"

#include "ash/wm/window_properties.h"

#include "ash/wm/window_state.h"

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

-#include "ash/wm_shell.h"

#include "ash/wm_window.h"

#include "base/macros.h"

#include "base/run_loop.h"

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

SessionControllerClient::FlushForTesting();

shelf_ =

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

+ ash::WmShelf::ForWindow(ash::ShellPort::Get()->GetPrimaryRootWindow());

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

controller_ = GetChromeLauncherControllerImpl();

ASSERT_TRUE(controller_);