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

Side by Side Diff: ash/wm/drag_window_resizer_unittest.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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
« no previous file with comments | « ash/wm/drag_window_resizer.cc ('k') | ash/wm/immersive_fullscreen_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/drag_window_resizer.h" 5 #include "ash/wm/drag_window_resizer.h"
6 6
7 #include "ash/display/mouse_cursor_event_filter.h" 7 #include "ash/display/mouse_cursor_event_filter.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 transient_child_ = new aura::Window(&delegate4_); 72 transient_child_ = new aura::Window(&delegate4_);
73 transient_child_->SetType(ui::wm::WINDOW_TYPE_NORMAL); 73 transient_child_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
74 transient_child_->Init(aura::WINDOW_LAYER_NOT_DRAWN); 74 transient_child_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
75 ParentWindowInPrimaryRootWindow(transient_child_); 75 ParentWindowInPrimaryRootWindow(transient_child_);
76 transient_child_->set_id(4); 76 transient_child_->set_id(4);
77 77
78 transient_parent_.reset(new aura::Window(&delegate5_)); 78 transient_parent_.reset(new aura::Window(&delegate5_));
79 transient_parent_->SetType(ui::wm::WINDOW_TYPE_NORMAL); 79 transient_parent_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
80 transient_parent_->Init(aura::WINDOW_LAYER_NOT_DRAWN); 80 transient_parent_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
81 ParentWindowInPrimaryRootWindow(transient_parent_.get()); 81 ParentWindowInPrimaryRootWindow(transient_parent_.get());
82 views::corewm::AddTransientChild(transient_parent_.get(), transient_child_); 82 ::wm::AddTransientChild(transient_parent_.get(), transient_child_);
83 transient_parent_->set_id(5); 83 transient_parent_->set_id(5);
84 84
85 panel_window_.reset(new aura::Window(&delegate6_)); 85 panel_window_.reset(new aura::Window(&delegate6_));
86 panel_window_->SetType(ui::wm::WINDOW_TYPE_PANEL); 86 panel_window_->SetType(ui::wm::WINDOW_TYPE_PANEL);
87 panel_window_->Init(aura::WINDOW_LAYER_NOT_DRAWN); 87 panel_window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
88 ParentWindowInPrimaryRootWindow(panel_window_.get()); 88 ParentWindowInPrimaryRootWindow(panel_window_.get());
89 } 89 }
90 90
91 virtual void TearDown() OVERRIDE { 91 virtual void TearDown() OVERRIDE {
92 window_.reset(); 92 window_.reset();
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 ASSERT_TRUE(resizer.get()); 628 ASSERT_TRUE(resizer.get());
629 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0); 629 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
630 EXPECT_TRUE(WarpMouseCursorIfNecessary(root_windows[0], 630 EXPECT_TRUE(WarpMouseCursorIfNecessary(root_windows[0],
631 gfx::Point(399, 200))); 631 gfx::Point(399, 200)));
632 resizer->CompleteDrag(); 632 resizer->CompleteDrag();
633 } 633 }
634 } 634 }
635 635
636 } // namespace internal 636 } // namespace internal
637 } // namespace ash 637 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/drag_window_resizer.cc ('k') | ash/wm/immersive_fullscreen_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698