chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2766543002: Move even 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/arc_app_window_launcher_controller.cc

Issue 2766543002: Move even more from WmShell to Shell (Closed)

Patch Set: 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/chrome_shell_delegate.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/arc_app_window_launcher_controller.cc

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

index d6bffcdd19917853d75e8643e8ff8159873f1ab3..87acd04b725b37c88b165ef5c78177b72d4f1b67 100644

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

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

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

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

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/common/wm/window_state.h"

-#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

#include "ash/display/screen_orientation_controller_chromeos.h"

#include "ash/shared/app_types.h"

@@ -423,7 +422,7 @@ void ArcAppWindowLauncherController::AttachControllerToWindowIfNeeded(

RegisterApp(info);

DCHECK(info->app_window()->controller());

window->SetProperty(ash::kShelfIDKey, info->app_window()->shelf_id());

- if (ash::WmShell::Get()

+ if (ash::Shell::Get()

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled()) {

SetOrientationLockForAppWindow(info->app_window());

@@ -555,7 +554,7 @@ void ArcAppWindowLauncherController::OnTaskOrientationLockRequested(

return;

info->set_requested_orientation_lock(orientation_lock);

- if (ash::WmShell::Get()

+ if (ash::Shell::Get()

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled()) {

AppWindow* app_window = info->app_window();