chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc - Issue 2731663002: Remove WmWindowProperty

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 2731663002: Remove WmWindowProperty (Closed)

Patch Set: rebase Created 3 years, 10 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/chrome_launcher_controller_impl_browsertest.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 a1612beda18399da09aa88eb4f406c863d866322..dc3ddfd6c70b8ce74bf814847e2d0c99fde9bcea 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

@@ -11,9 +11,9 @@

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

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

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

#include "ash/public/cpp/shelf_application_menu_item.h"

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

+#include "ash/wm/window_properties.h"

#include "ash/wm/window_util.h"

#include "base/memory/ptr_util.h"

#include "chrome/browser/chrome_notification_types.h"

@@ -178,10 +178,9 @@ void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(

IsSettingsBrowser(browser))

return;

- ash::WmWindow::Get(browser->window()->GetNativeWindow())

- ->SetIntProperty(

- ash::WmWindowProperty::SHELF_ID,

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

+ browser->window()->GetNativeWindow()->SetProperty(

+ ash::kShelfIDKey,

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

}

ash::ShelfAction BrowserShortcutLauncherItemController::ItemSelected(