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

Unified Diff: ash/display/display_controller_unittest.cc

Issue 557693002: [Ash] Only snap windows that can maximize. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix up other tests. Created 6 years, 3 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/display/display_controller_unittest.cc
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
index cb2bcb2542c20d7baee41447332622d73a3a1263..cfc6109b611f120f67d535ed677136f7698cd3c2 100644
--- a/ash/display/display_controller_unittest.cc
+++ b/ash/display/display_controller_unittest.cc
@@ -23,6 +23,7 @@
#include "ui/aura/client/focus_change_observer.h"
#include "ui/aura/client/focus_client.h"
#include "ui/aura/env.h"
+#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/window_tracker.h"
#include "ui/aura/window_tree_host.h"
#include "ui/events/event_handler.h"
@@ -554,7 +555,10 @@ TEST_F(DisplayControllerTest, MirrorToDockedWithFullscreen) {
return;
// Creates windows to catch activation change event.
- scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithId(1));
+ scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(
+ aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(),
+ 1,
+ gfx::Rect()));
oshima 2014/09/11 17:25:49 what kind of error you had?
jackhou1 2014/09/11 18:02:18 Basically they'd fail because CanMaximize is false
w1->Focus();
// Docked mode.
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698