chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc - Issue 2332393003: mash: Remove shelf util functions; use WmWindow properties.

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

Issue 2332393003: mash: Remove shelf util functions; use WmWindow properties. (Closed)

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

Index: chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc

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

index 97a6177619f9d0ac086aa669297d4166d5d6513f..b4ac0f35b9c860269e6c064024178927261dcc05 100644

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

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

@@ -4,9 +4,10 @@

#include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h"

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

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

#include "ash/common/wm_shell.h"

-#include "ash/shelf/shelf_util.h"

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

#include "ash/wm/window_util.h"

#include "base/stl_util.h"

#include "base/strings/stringprintf.h"

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

#include "extensions/browser/app_window/app_window.h"

#include "extensions/browser/app_window/native_app_window.h"

#include "extensions/common/extension.h"

+#include "ui/aura/window.h"

#include "ui/aura/window_event_dispatcher.h"

using extensions::AppWindow;

@@ -180,7 +182,8 @@ void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {

app_controller_map_[app_shelf_id] = controller;

}

owner()->SetItemStatus(shelf_id, status);

- ash::SetShelfIDForWindow(shelf_id, window);

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

+ ash::WmWindowProperty::SHELF_ID, shelf_id);

}

void ExtensionAppWindowLauncherController::UnregisterApp(aura::Window* window) {