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

Unified Diff: ash/wm/panels/panel_window_resizer_unittest.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/wm/panels/panel_window_event_handler.cc ('k') | ash/wm/power_button_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panels/panel_window_resizer_unittest.cc
diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc
index 4f1bdeabc2a37fd8f2926a1e6780cf1707ebb006..07406975fbb8b671215fa7f4df48b6e698cce146 100644
--- a/ash/wm/panels/panel_window_resizer_unittest.cc
+++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -132,9 +132,9 @@ class PanelWindowResizerTest : public test::AshTestBase {
void TestWindowOrder(const std::vector<aura::Window*>& window_order) {
int panel_index = model_->FirstPanelIndex();
EXPECT_EQ((int)(panel_index + window_order.size()), model_->item_count());
- for (std::vector<aura::Window*>::const_iterator iter =
- window_order.begin(); iter != window_order.end();
- ++iter, ++panel_index) {
+ for (std::vector<aura::Window *>::const_iterator
+ iter = window_order.begin();
+ iter != window_order.end(); ++iter, ++panel_index) {
ShelfID id = GetShelfIDForWindow(*iter);
EXPECT_EQ(id, model_->items()[panel_index].id);
}
@@ -228,20 +228,20 @@ class PanelWindowResizerTransientTest
// Verifies a window can be dragged from the panel and detached and then
// reattached.
TEST_F(PanelWindowResizerTest, PanelDetachReattachBottom) {
- if (!SupportsHostWindowResize())
+ if (!SupportsHostWindowResize())
return;
- std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
- DetachReattachTest(window.get(), 0, -1);
+ std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
+ DetachReattachTest(window.get(), 0, -1);
}
TEST_F(PanelWindowResizerTest, PanelDetachReattachLeft) {
- if (!SupportsHostWindowResize())
+ if (!SupportsHostWindowResize())
return;
- Shelf::ForPrimaryDisplay()->SetAlignment(SHELF_ALIGNMENT_LEFT);
- std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
- DetachReattachTest(window.get(), 1, 0);
+ Shelf::ForPrimaryDisplay()->SetAlignment(SHELF_ALIGNMENT_LEFT);
+ std::unique_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
+ DetachReattachTest(window.get(), 1, 0);
}
TEST_F(PanelWindowResizerTest, PanelDetachReattachRight) {
@@ -420,8 +420,7 @@ TEST_F(PanelWindowResizerTest, AttachToSecondFullscreenDisplay) {
DragStart(window.get());
DragMove(500, 250);
EXPECT_EQ(initial_bounds.x() + 500, window->GetBoundsInScreen().x());
- EXPECT_GT(window->GetBoundsInScreen().y(),
- initial_bounds.y() + 200);
+ EXPECT_GT(window->GetBoundsInScreen().y(), initial_bounds.y() + 200);
DragEnd();
// When dropped should move to second display's panel container.
@@ -510,7 +509,7 @@ TEST_P(PanelWindowResizerTransientTest, PanelWithTransientChild) {
// Drag the child to the shelf. Its new position should not be overridden.
const gfx::Rect attached_bounds(window->GetBoundsInScreen());
const int dy = window->GetBoundsInScreen().bottom() -
- child->GetBoundsInScreen().bottom();
+ child->GetBoundsInScreen().bottom();
DragStart(child.get());
DragMove(50, dy);
// While moving the transient child window should be in the panel container.
@@ -555,7 +554,8 @@ TEST_P(PanelWindowResizerTransientTest, PanelWithTransientChild) {
EXPECT_EQ(kShellWindowId_DefaultContainer, child->parent()->id());
}
-INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest,
+INSTANTIATE_TEST_CASE_P(LtrRtl,
+ PanelWindowResizerTextDirectionTest,
testing::Bool());
INSTANTIATE_TEST_CASE_P(NormalPanelPopup,
PanelWindowResizerTransientTest,
« no previous file with comments | « ash/wm/panels/panel_window_event_handler.cc ('k') | ash/wm/power_button_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698