chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2629643002: chromeos: Renames WmWindowAura 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/launcher/arc_app_window_launcher_controller.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)

Patch Set: feedback Created 3 years, 11 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/browser_shortcut_launcher_item_controller.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 03b2c43e3fefc09d28881caa2baacb9d9d9bfc6b..8f3d9f069dbb14c9d27abd01428d7b35dd67b8fc 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

@@ -5,12 +5,12 @@

#include <string>

-#include "ash/aura/wm_window_aura.h"

#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_lookup.h"

#include "ash/common/wm_shell.h"

+#include "ash/common/wm_window.h"

#include "ash/common/wm_window_property.h"

#include "ash/display/screen_orientation_controller_chromeos.h"

#include "ash/shared/app_types.h"

@@ -423,8 +423,8 @@ void ArcAppWindowLauncherController::AttachControllerToWindowIfNeeded(

base::MakeUnique<AppWindow>(task_id, info->app_shelf_id(), widget, this));

RegisterApp(info);

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

- ash::WmWindowAura::Get(window)->SetIntProperty(

- ash::WmWindowProperty::SHELF_ID, info->app_window()->shelf_id());

+ ash::WmWindow::Get(window)->SetIntProperty(ash::WmWindowProperty::SHELF_ID,

+ info->app_window()->shelf_id());

if (ash::WmShell::Get()

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled()) {