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

Unified Diff: ash/test/ash_test_base.h

Issue 2828543003: chromeos: converts DragImageViewTest to AshTestBase (Closed)
Patch Set: cleanup Created 3 years, 8 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/shelf/shelf_view.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index 21eeea617cfa595d5f9b619d0cd136339f2269ce..6f4a493e63a64f7f6f6cc87cc0a7e828f058bff8 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -10,6 +10,7 @@
#include <memory>
#include <string>
+#include "ash/public/cpp/shell_window_ids.h"
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/threading/thread.h"
@@ -91,6 +92,17 @@ class AshTestBase : public testing::Test {
int container_id,
const gfx::Rect& bounds);
+ // Creates a visible window in the appropriate container. If
+ // |bounds_in_screen| is empty the window is added to the primary root
+ // window, otherwise the window is added to the display matching
+ // |bounds_in_screen|. |shell_window_id| is the shell window id to give to
+ // the new window.
+ // TODO(sky): convert existing CreateTestWindow() functions into this one.
msw 2017/04/18 21:43:09 aside q: Will returning a unique_ptr instead of a
sky 2017/04/18 22:03:02 I actually haven't done a big analysis. I generall
+ std::unique_ptr<aura::Window> CreateTestWindow(
msw 2017/04/18 21:43:09 optional nit: order params to match CreateTestWind
sky 2017/04/18 22:03:02 I went with this ordering based on looking at test
+ const gfx::Rect& bounds_in_screen = gfx::Rect(),
+ ui::wm::WindowType type = ui::wm::WINDOW_TYPE_NORMAL,
+ int shell_window_id = kShellWindowId_Invalid);
+
// Versions of the functions in aura::test:: that go through our shell
// StackingController instead of taking a parent.
aura::Window* CreateTestWindowInShellWithId(int id);
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698