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

Unified Diff: ash/shelf/shelf_widget_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/shelf/shelf_widget.cc ('k') | ash/shelf/shelf_window_watcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget_unittest.cc
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc
index 4f80af05302758bfb93bfd8b8b430e89956518d8..aa395c9643c548b9a3b45b07926b21e41cc59d16 100644
--- a/ash/shelf/shelf_widget_unittest.cc
+++ b/ash/shelf/shelf_widget_unittest.cc
@@ -36,7 +36,7 @@ ShelfLayoutManager* GetShelfLayoutManager() {
return GetShelfWidget()->shelf_layout_manager();
}
-} // namespace
+} // namespace
using ShelfWidgetTest = test::AshMDTestBase;
@@ -144,12 +144,12 @@ TEST_P(ShelfWidgetTest, LauncherInitiallySized) {
ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManager();
ASSERT_TRUE(shelf_layout_manager);
ASSERT_TRUE(shelf_widget->status_area_widget());
- int status_width = shelf_widget->status_area_widget()->
- GetWindowBoundsInScreen().width();
+ int status_width =
+ shelf_widget->status_area_widget()->GetWindowBoundsInScreen().width();
// Test only makes sense if the status is > 0, which it better be.
EXPECT_GT(status_width, 0);
EXPECT_EQ(status_width, shelf_widget->GetContentsView()->width() -
- test::ShelfTestAPI(shelf).shelf_view()->width());
+ test::ShelfTestAPI(shelf).shelf_view()->width());
}
// Verifies when the shell is deleted with a full screen window we don't crash.
@@ -175,8 +175,7 @@ TEST_P(ShelfWidgetTest, ShelfInitiallySizedAfterLogin) {
Shell::RootWindowControllerList controllers(
Shell::GetAllRootWindowControllers());
for (Shell::RootWindowControllerList::const_iterator i = controllers.begin();
- i != controllers.end();
- ++i) {
+ i != controllers.end(); ++i) {
if (!(*i)->shelf_widget()->shelf()) {
shelf_widget = (*i)->shelf_widget();
break;
@@ -193,9 +192,8 @@ TEST_P(ShelfWidgetTest, ShelfInitiallySizedAfterLogin) {
const int status_width =
shelf_widget->status_area_widget()->GetWindowBoundsInScreen().width();
EXPECT_GT(status_width, 0);
- EXPECT_EQ(status_width,
- shelf_widget->GetContentsView()->width() -
- test::ShelfTestAPI(shelf).shelf_view()->width());
+ EXPECT_EQ(status_width, shelf_widget->GetContentsView()->width() -
+ test::ShelfTestAPI(shelf).shelf_view()->width());
}
#endif // defined(OS_CHROMEOS)
« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/shelf/shelf_window_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698