chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc - Issue 2750463009: mash: Fix ShelfItem mojo struct; add enums and traits.

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

Issue 2750463009: mash: Fix ShelfItem mojo struct; add enums and traits. (Closed)

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

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

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

index 384a0f040b037aa3e8a61294a8656027517cd15d..1af52045db1c66ef2cf443f43a0e6fb3658d8a3c 100644

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

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

@@ -17,12 +17,12 @@

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

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

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

-#include "ash/common/shelf/shelf_item_types.h"

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

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

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/display/screen_orientation_controller_chromeos.h"

+#include "ash/public/cpp/shelf_item.h"

#include "ash/shell.h"

#include "ash/test/ash_test_helper.h"

#include "ash/test/test_shell_delegate.h"

@@ -4243,7 +4243,7 @@ class TestShelfController : public ash::mojom::ShelfController {

observer_->OnAutoHideBehaviorChanged(auto_hide_, display_id);

}

void PinItem(

- ash::mojom::ShelfItemPtr item,

+ const ash::ShelfItem& item,

ash::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override {}

void UnpinItem(const std::string& app_id) override {}

void SetItemImage(const std::string& app_id, const SkBitmap& image) override {