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

Unified Diff: ash/wm/system_modal_container_layout_manager_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/system_modal_container_layout_manager.cc ('k') | ash/wm/toplevel_window_event_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_modal_container_layout_manager_unittest.cc
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc
index dfb17eccfc4a4f12aeea7c84902fdfd9ecd7c0a3..c8c5b4890ec198e4df37e2fd733b318f891e3168 100644
--- a/ash/wm/system_modal_container_layout_manager_unittest.cc
+++ b/ash/wm/system_modal_container_layout_manager_unittest.cc
@@ -50,7 +50,8 @@ bool AllRootWindowsHaveModalBackgroundsForContainer(int container_id) {
for (std::vector<aura::Window*>::iterator iter = containers.begin();
iter != containers.end(); ++iter) {
has_modal_screen &= static_cast<SystemModalContainerLayoutManager*>(
- (*iter)->layout_manager())->has_modal_background();
+ (*iter)->layout_manager())
+ ->has_modal_background();
}
return has_modal_screen;
}
@@ -93,8 +94,7 @@ class TestWindow : public views::WidgetDelegateView {
class EventTestWindow : public TestWindow {
public:
- explicit EventTestWindow(bool modal) : TestWindow(modal),
- mouse_presses_(0) {}
+ explicit EventTestWindow(bool modal) : TestWindow(modal), mouse_presses_(0) {}
~EventTestWindow() override {}
aura::Window* OpenTestWindowWithContext(aura::Window* context) {
@@ -106,8 +106,7 @@ class EventTestWindow : public TestWindow {
aura::Window* OpenTestWindowWithParent(aura::Window* parent) {
DCHECK(parent);
- views::Widget* widget =
- views::Widget::CreateWindowWithParent(this, parent);
+ views::Widget* widget = views::Widget::CreateWindowWithParent(this, parent);
widget->Show();
return widget->GetNativeView();
}
@@ -119,6 +118,7 @@ class EventTestWindow : public TestWindow {
}
int mouse_presses() const { return mouse_presses_; }
+
private:
int mouse_presses_;
@@ -195,7 +195,6 @@ class SystemModalContainerLayoutManagerTest : public AshTestBase {
DCHECK_EQ(show, keyboard->keyboard_visible());
}
-
};
TEST_F(SystemModalContainerLayoutManagerTest, NonModalTransient) {
@@ -347,8 +346,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, EventFocusContainers) {
EXPECT_EQ(1, transient_delegate->mouse_presses());
for (int block_reason = FIRST_BLOCK_REASON;
- block_reason < NUMBER_OF_BLOCK_REASONS;
- ++block_reason) {
+ block_reason < NUMBER_OF_BLOCK_REASONS; ++block_reason) {
// Create a window in the lock screen container and ensure that it receives
// the mouse event instead of the modal window (crbug.com/110920).
BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
@@ -464,8 +462,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, ShowNormalBackgroundOrLocked) {
EXPECT_FALSE(AllRootWindowsHaveLockedModalBackgrounds());
for (int block_reason = FIRST_BLOCK_REASON;
- block_reason < NUMBER_OF_BLOCK_REASONS;
- ++block_reason) {
+ block_reason < NUMBER_OF_BLOCK_REASONS; ++block_reason) {
// Normal system modal window while blocked. Shows blocked system modal
// background.
BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
« no previous file with comments | « ash/wm/system_modal_container_layout_manager.cc ('k') | ash/wm/toplevel_window_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698