Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(834)

Unified Diff: ash/wm/overview/window_selector_unittest.cc

Issue 2878133002: mash: Serialize ShelfIDs for property conversion and transport. (Closed)
Patch Set: Remove |user_windows_with_items_| entries in workaround; disable a test in mash. 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
Index: ash/wm/overview/window_selector_unittest.cc
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index 2e437ff82dad42a1e0ec9d000dd71aceed057c36..73fa6b95314ba202acad7cb7ac136bddbead1360 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -148,7 +148,8 @@ class WindowSelectorTest : public test::AshTestBase {
aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
nullptr, ui::wm::WINDOW_TYPE_PANEL, 0, bounds);
static int id = 0;
- window->SetProperty(kShelfIDKey, new ShelfID(base::IntToString(id++)));
+ std::string shelf_id(ash::ShelfID(base::IntToString(id++)).Serialize());
James Cook 2017/05/15 16:37:23 Is ash:: needed?
msw 2017/05/15 19:21:32 Done.
+ window->SetProperty(kShelfIDKey, new std::string(shelf_id));
window->SetProperty(aura::client::kTopViewInset, kHeaderHeight);
shelf_view_test()->RunMessageLoopUntilAnimationsDone();
return window;

Powered by Google App Engine
This is Rietveld 408576698