chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 2055053002: mash: Convert ash::ShellDelegate from aura::Window to WmWindow

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/chrome_shell_delegate.cc

Issue 2055053002: mash: Convert ash::ShellDelegate from aura::Window to WmWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movetrayupdate

Patch Set: rebase Created 4 years, 6 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.h ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/chrome_shell_delegate.cc

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

index 2522fad0b89d324e67c1446f587e8ebbe0e65dd9..c6447f20b9a4e6f73f2d07c82c9fee90d4e38d59 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc

+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -17,6 +17,7 @@

#include "ash/container_delegate_aura.h"

#include "ash/content/gpu_support_impl.h"

#include "ash/pointer_watcher_delegate_aura.h"

+#include "ash/shell.h"

#include "ash/wm/window_util.h"

#include "base/command_line.h"

#include "base/macros.h"

@@ -359,8 +360,9 @@ bool ChromeShellDelegate::IsRunningInForcedAppMode() const {

return chrome::IsRunningInForcedAppMode();

}

-bool ChromeShellDelegate::CanShowWindowForUser(aura::Window* window) const {

- return ::CanShowWindowForUser(window, base::Bind(&GetActiveBrowserContext));

+bool ChromeShellDelegate::CanShowWindowForUser(ash::WmWindow* window) const {

+ return ::CanShowWindowForUser(ash::WmWindowAura::GetAuraWindow(window),

+ base::Bind(&GetActiveBrowserContext));

}

bool ChromeShellDelegate::IsForceMaximizeOnFirstRun() const {