chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_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/browser_shortcut_launcher_item_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/arc_app_window_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/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/browser_shortcut_launcher_item_controller.cc

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

index 2d4fae387c885b34bf1c74fd81b40ce8b436c7ba..3ececf48d800737b61343ea1de4ce34996e0a941 100644

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

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

@@ -6,11 +6,12 @@

#include <vector>

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

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

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

#include "ash/common/wm_shell.h"

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

#include "ash/resources/grit/ash_resources.h"

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

#include "ash/wm/window_util.h"

#include "chrome/browser/profiles/profile.h"

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

@@ -117,15 +118,16 @@ void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {

void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(

Browser* browser,

content::WebContents* web_contents) {

- // We need to call SetShelfIDForWindow for V1 applications since they are

+ // We need to set the window ShelfID for V1 applications since they are

// content which might change and as such change the application type.

if (!browser || !IsBrowserFromActiveUser(browser) ||

IsSettingsBrowser(browser))

return;

- ash::SetShelfIDForWindow(

- launcher_controller()->GetShelfIDForWebContents(web_contents),

- browser->window()->GetNativeWindow());

+ ash::WmWindowAura::Get(browser->window()->GetNativeWindow())

+ ->SetIntProperty(

+ ash::WmWindowProperty::SHELF_ID,

+ launcher_controller()->GetShelfIDForWebContents(web_contents));

}

bool BrowserShortcutLauncherItemController::IsOpen() const {