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

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

index a166ded0987f905381ae6f930ee18299df5d61ab..c3b686116767711c1041d02c61f11950de6517b3 100644

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

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

@@ -2166,14 +2166,13 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, MatchingShelfIDandActiveTab) {

EXPECT_EQ(0, browser()->tab_strip_model()->active_index());

EXPECT_EQ(2, model_->item_count());

- ash::WmWindow* window =

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

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

int browser_index = GetIndexOfShelfItemType(ash::TYPE_BROWSER_SHORTCUT);

ash::ShelfID browser_id = model_->items()[browser_index].id;

- ash::ShelfID* id = window->aura_window()->GetProperty(ash::kShelfIDKey);

- ASSERT_NE(nullptr, id);

- EXPECT_EQ(browser_id, *id);

+ ash::ShelfID id =

+ ash::ShelfID::Deserialize(window->GetProperty(ash::kShelfIDKey));

+ EXPECT_EQ(browser_id, id);

ash::ShelfID app_id = CreateShortcut("app1");

EXPECT_EQ(3, model_->item_count());

@@ -2182,16 +2181,14 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, MatchingShelfIDandActiveTab) {

WmShelf::ActivateShelfItem(model_->ItemIndexByID(app_id));

EXPECT_EQ(2, browser()->tab_strip_model()->count());

EXPECT_EQ(1, browser()->tab_strip_model()->active_index());

- id = window->aura_window()->GetProperty(ash::kShelfIDKey);

- ASSERT_NE(nullptr, id);

- EXPECT_EQ(app_id, *id);

+ id = ash::ShelfID::Deserialize(window->GetProperty(ash::kShelfIDKey));

+ EXPECT_EQ(app_id, id);

// Activate the tab at index 0 (NTP) and expect a browser ShelfID.

browser()->tab_strip_model()->ActivateTabAt(0, false);

EXPECT_EQ(0, browser()->tab_strip_model()->active_index());

- id = window->aura_window()->GetProperty(ash::kShelfIDKey);

- ASSERT_NE(nullptr, id);

- EXPECT_EQ(browser_id, *id);

+ id = ash::ShelfID::Deserialize(window->GetProperty(ash::kShelfIDKey));

+ EXPECT_EQ(browser_id, id);

}

IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, OverflowBubble) {