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

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

Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)
Patch Set: Fix struct traits typo. 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_shelf_item_delegate.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 892bcd4bfee1405751e8ecaad77aab6053d4065f..2e437ff82dad42a1e0ec9d000dd71aceed057c36 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -9,6 +9,7 @@
#include "ash/accessibility_types.h"
#include "ash/drag_drop/drag_drop_controller.h"
#include "ash/public/cpp/config.h"
+#include "ash/public/cpp/window_properties.h"
#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
@@ -28,6 +29,7 @@
#include "ash/wm/wm_event.h"
#include "ash/wm/workspace/workspace_window_resizer.h"
#include "ash/wm_window.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/user_action_tester.h"
#include "ui/aura/client/aura_constants.h"
@@ -145,6 +147,8 @@ class WindowSelectorTest : public test::AshTestBase {
aura::Window* CreatePanelWindow(const gfx::Rect& bounds) {
aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
nullptr, ui::wm::WINDOW_TYPE_PANEL, 0, bounds);
+ static int id = 0;
+ window->SetProperty(kShelfIDKey, new ShelfID(base::IntToString(id++)));
window->SetProperty(aura::client::kTopViewInset, kHeaderHeight);
shelf_view_test()->RunMessageLoopUntilAnimationsDone();
return window;
« no previous file with comments | « ash/shell/window_watcher_shelf_item_delegate.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