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

Side by Side Diff: ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

Issue 2729363002: chromeos: Move files in //ash/common to //ash, part 3 (Closed)
Patch Set: Created 3 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/system/web_notification/ash_popup_alignment_delegate.h" 5 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/wm_shell.h"
11 #include "ash/common/wm_window.h"
12 #include "ash/public/cpp/shelf_types.h" 10 #include "ash/public/cpp/shelf_types.h"
13 #include "ash/public/cpp/shell_window_ids.h" 11 #include "ash/public/cpp/shell_window_ids.h"
14 #include "ash/root_window_controller.h" 12 #include "ash/root_window_controller.h"
15 #include "ash/shelf/wm_shelf.h" 13 #include "ash/shelf/wm_shelf.h"
16 #include "ash/shell.h" 14 #include "ash/shell.h"
17 #include "ash/test/ash_test_base.h" 15 #include "ash/test/ash_test_base.h"
16 #include "ash/wm_shell.h"
17 #include "ash/wm_window.h"
18 #include "base/command_line.h" 18 #include "base/command_line.h"
19 #include "base/memory/ptr_util.h" 19 #include "base/memory/ptr_util.h"
20 #include "ui/display/manager/display_manager.h" 20 #include "ui/display/manager/display_manager.h"
21 #include "ui/display/screen.h" 21 #include "ui/display/screen.h"
22 #include "ui/gfx/geometry/rect.h" 22 #include "ui/gfx/geometry/rect.h"
23 #include "ui/keyboard/keyboard_switches.h" 23 #include "ui/keyboard/keyboard_switches.h"
24 #include "ui/keyboard/keyboard_util.h" 24 #include "ui/keyboard/keyboard_util.h"
25 #include "ui/message_center/message_center_style.h" 25 #include "ui/message_center/message_center_style.h"
26 26
27 namespace ash { 27 namespace ash {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 shelf->SetVirtualKeyboardBoundsForTesting(keyboard_bounds); 282 shelf->SetVirtualKeyboardBoundsForTesting(keyboard_bounds);
283 int keyboard_baseline = alignment_delegate()->GetBaseLine(); 283 int keyboard_baseline = alignment_delegate()->GetBaseLine();
284 EXPECT_NE(baseline, keyboard_baseline); 284 EXPECT_NE(baseline, keyboard_baseline);
285 EXPECT_GT(keyboard_bounds.y(), keyboard_baseline); 285 EXPECT_GT(keyboard_bounds.y(), keyboard_baseline);
286 286
287 shelf->SetVirtualKeyboardBoundsForTesting(gfx::Rect()); 287 shelf->SetVirtualKeyboardBoundsForTesting(gfx::Rect());
288 EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine()); 288 EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
289 } 289 }
290 290
291 } // namespace ash 291 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/web_notification/ash_popup_alignment_delegate.cc ('k') | ash/system/web_notification/web_notification_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698