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

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

Issue 2237433002: ash: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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
« no previous file with comments | « ash/wm/system_modal_container_layout_manager.cc ('k') | no next file » | 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/common/wm/workspace/multi_window_resize_controller.h" 5 #include "ash/common/wm/workspace/multi_window_resize_controller.h"
6 6
7 #include "ash/aura/wm_window_aura.h" 7 #include "ash/aura/wm_window_aura.h"
8 #include "ash/common/ash_constants.h" 8 #include "ash/common/ash_constants.h"
9 #include "ash/common/frame/custom_frame_view_ash.h" 9 #include "ash/common/frame/custom_frame_view_ash.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 void Hide() { resize_controller_->Hide(); } 83 void Hide() { resize_controller_->Hide(); }
84 84
85 bool HasTarget(aura::Window* window) { 85 bool HasTarget(aura::Window* window) {
86 if (!resize_controller_->windows_.is_valid()) 86 if (!resize_controller_->windows_.is_valid())
87 return false; 87 return false;
88 WmWindow* wm_window = WmWindowAura::Get(window); 88 WmWindow* wm_window = WmWindowAura::Get(window);
89 if ((resize_controller_->windows_.window1 == wm_window || 89 if ((resize_controller_->windows_.window1 == wm_window ||
90 resize_controller_->windows_.window2 == wm_window)) 90 resize_controller_->windows_.window2 == wm_window))
91 return true; 91 return true;
92 return ContainsValue(resize_controller_->windows_.other_windows, wm_window); 92 return base::ContainsValue(resize_controller_->windows_.other_windows,
93 wm_window);
93 } 94 }
94 95
95 bool IsOverWindows(const gfx::Point& loc) { 96 bool IsOverWindows(const gfx::Point& loc) {
96 return resize_controller_->IsOverWindows(loc); 97 return resize_controller_->IsOverWindows(loc);
97 } 98 }
98 99
99 views::Widget* resize_widget() { 100 views::Widget* resize_widget() {
100 return resize_controller_->resize_widget_.get(); 101 return resize_controller_->resize_widget_.get();
101 } 102 }
102 103
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 355
355 // Clicking outside the resize handle should immediately hide the resize 356 // Clicking outside the resize handle should immediately hide the resize
356 // handle. 357 // handle.
357 EXPECT_FALSE(resize_widget_bounds_in_screen.Contains(w1_center_in_screen)); 358 EXPECT_FALSE(resize_widget_bounds_in_screen.Contains(w1_center_in_screen));
358 generator.MoveMouseTo(w1_center_in_screen); 359 generator.MoveMouseTo(w1_center_in_screen);
359 generator.ClickLeftButton(); 360 generator.ClickLeftButton();
360 EXPECT_FALSE(IsShowing()); 361 EXPECT_FALSE(IsShowing());
361 } 362 }
362 363
363 } // namespace ash 364 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/system_modal_container_layout_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698