chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc - Issue 2878133002: mash: Serialize ShelfIDs for property conversion and transport.

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 2878133002: mash: Serialize ShelfIDs for property conversion and transport. (Closed)

Patch Set: Address comments. Created 3 years, 7 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_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 ff45c10dd6aa78685a65722f1bc071948f38bf01..16af321f5054745bc49f4a593b9f7182e9754e96 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

@@ -172,11 +172,11 @@ void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(

return;

}

+ const ash::ShelfID shelf_id =

+ ChromeLauncherController::instance()->GetShelfIDForWebContents(

+ web_contents);

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

- ash::kShelfIDKey,

- new ash::ShelfID(

- ChromeLauncherController::instance()->GetShelfIDForWebContents(

- web_contents)));

+ ash::kShelfIDKey, new std::string(shelf_id.Serialize()));

}

void BrowserShortcutLauncherItemController::ItemSelected(