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

Unified Diff: ash/wm/overview/window_selector_unittest.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 | « ash/shell/window_watcher.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..6a46fe0b9ce59a82a7ca368adf0201f5f3554485 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(ShelfID(base::IntToString(id++)).Serialize());
+ window->SetProperty(kShelfIDKey, new std::string(shelf_id));
window->SetProperty(aura::client::kTopViewInset, kHeaderHeight);
shelf_view_test()->RunMessageLoopUntilAnimationsDone();
return window;
« no previous file with comments | « ash/shell/window_watcher.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698