chrome/browser/ui/ash/launcher/extension_app_window_launcher_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/extension_app_window_launcher_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/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/settings_window_observer.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 414b768c7cbe947bdea28f1d60ef8a5015d57503..fbf6bd2e293ab78573abb0828c14fd19c6048457 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

@@ -121,7 +121,7 @@ void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {

const ash::ShelfID shelf_id = GetShelfId(app_window);

DCHECK(!shelf_id.IsNull());

aura::Window* window = app_window->GetNativeWindow();

- window->SetProperty(ash::kShelfIDKey, new ash::ShelfID(shelf_id));

+ window->SetProperty(ash::kShelfIDKey, new std::string(shelf_id.Serialize()));

// Windows created by IME extension should be treated the same way as the

// virtual keyboard window, which does not register itself in launcher.

@@ -153,7 +153,7 @@ void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {

controller->AddAppWindow(app_window);

// Check for any existing pinned shelf item with a matching |shelf_id|.

- if (owner()->GetItem(shelf_id) == nullptr) {

+ if (!owner()->GetItem(shelf_id)) {

owner()->CreateAppLauncherItem(std::move(controller), status);

// Restore any existing app icon and flag as set.

if (app_window->HasCustomIcon() && !app_window->app_icon().IsEmpty()) {