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

Side by Side Diff: ash/wm/workspace/multi_window_resize_controller_unittest.cc

Issue 121773003: Makes Window::Init take a WindowLayerType instead of LayerType. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to master Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/workspace/multi_window_resize_controller.h" 5 #include "ash/wm/workspace/multi_window_resize_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "ash/test/shell_test_api.h" 9 #include "ash/test/shell_test_api.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 23 matching lines...) Expand all
34 WorkspaceControllerTestHelper(wc).GetEventHandler(); 34 WorkspaceControllerTestHelper(wc).GetEventHandler();
35 resize_controller_ = WorkspaceEventHandlerTestHelper(event_handler). 35 resize_controller_ = WorkspaceEventHandlerTestHelper(event_handler).
36 resize_controller(); 36 resize_controller();
37 } 37 }
38 38
39 protected: 39 protected:
40 aura::Window* CreateTestWindow(aura::WindowDelegate* delegate, 40 aura::Window* CreateTestWindow(aura::WindowDelegate* delegate,
41 const gfx::Rect& bounds) { 41 const gfx::Rect& bounds) {
42 aura::Window* window = new aura::Window(delegate); 42 aura::Window* window = new aura::Window(delegate);
43 window->SetType(ui::wm::WINDOW_TYPE_NORMAL); 43 window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
44 window->Init(ui::LAYER_TEXTURED); 44 window->Init(aura::WINDOW_LAYER_TEXTURED);
45 ParentWindowInPrimaryRootWindow(window); 45 ParentWindowInPrimaryRootWindow(window);
46 window->SetBounds(bounds); 46 window->SetBounds(bounds);
47 window->Show(); 47 window->Show();
48 return window; 48 return window;
49 } 49 }
50 50
51 void ShowNow() { 51 void ShowNow() {
52 resize_controller_->ShowNow(); 52 resize_controller_->ShowNow();
53 } 53 }
54 54
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 EXPECT_TRUE(HasTarget(w3.get())); 249 EXPECT_TRUE(HasTarget(w3.get()));
250 250
251 // Release the mouse. The resizer should still be visible and a subsequent 251 // Release the mouse. The resizer should still be visible and a subsequent
252 // press should not trigger a DCHECK. 252 // press should not trigger a DCHECK.
253 generator.ReleaseLeftButton(); 253 generator.ReleaseLeftButton();
254 EXPECT_TRUE(IsShowing()); 254 EXPECT_TRUE(IsShowing());
255 generator.PressLeftButton(); 255 generator.PressLeftButton();
256 } 256 }
257 } // namespace internal 257 } // namespace internal
258 } // namespace ash 258 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/toplevel_window_event_handler_unittest.cc ('k') | ash/wm/workspace/workspace_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698