Chromium Code Reviews| 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; |