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

Unified Diff: ash/shelf/shelf_window_watcher_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_window_watcher.cc ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_window_watcher_unittest.cc
diff --git a/ash/shelf/shelf_window_watcher_unittest.cc b/ash/shelf/shelf_window_watcher_unittest.cc
index 34dac4b78a6f85e65acfd96740ae74694a24caa1..989363d5f62ff944385f8cc5e34c4da986d2c07d 100644
--- a/ash/shelf/shelf_window_watcher_unittest.cc
+++ b/ash/shelf/shelf_window_watcher_unittest.cc
@@ -83,7 +83,6 @@ TEST_F(ShelfWindowWatcherTest, CreateAndRemoveShelfItem) {
// Clears twice doesn't do anything.
ClearShelfItemDetailsForWindow(w2.get());
EXPECT_EQ(1, model_->item_count());
-
}
TEST_F(ShelfWindowWatcherTest, ActivateWindow) {
@@ -190,14 +189,12 @@ TEST_F(ShelfWindowWatcherTest, ReparentWindow) {
EXPECT_EQ(STATUS_RUNNING, model_->items()[index].status);
aura::Window* root_window = window->GetRootWindow();
- aura::Window* default_container = Shell::GetContainer(
- root_window,
- kShellWindowId_DefaultContainer);
+ aura::Window* default_container =
+ Shell::GetContainer(root_window, kShellWindowId_DefaultContainer);
EXPECT_EQ(default_container, window->parent());
- aura::Window* new_parent = Shell::GetContainer(
- root_window,
- kShellWindowId_PanelContainer);
+ aura::Window* new_parent =
+ Shell::GetContainer(root_window, kShellWindowId_PanelContainer);
// Check |window|'s item is removed when it is re-parented to |new_parent|
// which is not default container.
@@ -233,7 +230,7 @@ TEST_F(ShelfWindowWatcherTest, DragWindow) {
resizer->Drag(gfx::Point(50, 50), 0);
resizer->CompleteDrag();
- //Index and id are not changed after dragging a |window|.
+ // Index and id are not changed after dragging a |window|.
EXPECT_EQ(index, model_->ItemIndexByID(id));
EXPECT_EQ(id, model_->items()[index].id);
}
@@ -254,14 +251,12 @@ TEST_F(ShelfWindowWatcherTest, ReparentWindowDuringTheDragging) {
EXPECT_EQ(STATUS_RUNNING, model_->items()[index].status);
aura::Window* root_window = window->GetRootWindow();
- aura::Window* default_container = Shell::GetContainer(
- root_window,
- kShellWindowId_DefaultContainer);
+ aura::Window* default_container =
+ Shell::GetContainer(root_window, kShellWindowId_DefaultContainer);
EXPECT_EQ(default_container, window->parent());
- aura::Window* new_parent = Shell::GetContainer(
- root_window,
- kShellWindowId_PanelContainer);
+ aura::Window* new_parent =
+ Shell::GetContainer(root_window, kShellWindowId_PanelContainer);
// Simulate re-parenting to |new_parent| during the dragging.
{
« no previous file with comments | « ash/shelf/shelf_window_watcher.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698