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

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

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 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
« no previous file with comments | « ash/shell/toplevel_window.cc ('k') | ash/wm/ash_focus_rules.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/web_notification_tray.h" 5 #include "ash/system/web_notification/web_notification_tray.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/public/cpp/config.h" 10 #include "ash/public/cpp/config.h"
11 #include "ash/public/cpp/shell_window_ids.h" 11 #include "ash/public/cpp/shell_window_ids.h"
12 #include "ash/shelf/shelf_layout_manager.h" 12 #include "ash/shelf/shelf_layout_manager.h"
13 #include "ash/shelf/wm_shelf.h" 13 #include "ash/shelf/wm_shelf.h"
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #include "ash/system/screen_layout_observer.h" 15 #include "ash/system/screen_layout_observer.h"
16 #include "ash/system/status_area_widget.h" 16 #include "ash/system/status_area_widget.h"
17 #include "ash/system/tray/system_tray.h" 17 #include "ash/system/tray/system_tray.h"
18 #include "ash/system/tray/system_tray_item.h" 18 #include "ash/system/tray/system_tray_item.h"
19 #include "ash/system/web_notification/ash_popup_alignment_delegate.h" 19 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"
20 #include "ash/test/ash_test_base.h" 20 #include "ash/test/ash_test_base.h"
21 #include "ash/test/status_area_widget_test_helper.h" 21 #include "ash/test/status_area_widget_test_helper.h"
22 #include "ash/test/test_system_tray_delegate.h" 22 #include "ash/test/test_system_tray_delegate.h"
23 #include "ash/wm/window_state.h" 23 #include "ash/wm/window_state.h"
24 #include "ash/wm/window_state_aura.h"
25 #include "base/memory/ptr_util.h" 24 #include "base/memory/ptr_util.h"
26 #include "base/strings/stringprintf.h" 25 #include "base/strings/stringprintf.h"
27 #include "base/strings/utf_string_conversions.h" 26 #include "base/strings/utf_string_conversions.h"
28 #include "ui/display/display.h" 27 #include "ui/display/display.h"
29 #include "ui/display/manager/display_manager.h" 28 #include "ui/display/manager/display_manager.h"
30 #include "ui/display/screen.h" 29 #include "ui/display/screen.h"
31 #include "ui/events/test/event_generator.h" 30 #include "ui/events/test/event_generator.h"
32 #include "ui/gfx/geometry/point.h" 31 #include "ui/gfx/geometry/point.h"
33 #include "ui/gfx/geometry/rect.h" 32 #include "ui/gfx/geometry/rect.h"
34 #include "ui/message_center/message_center_style.h" 33 #include "ui/message_center/message_center_style.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 int bottom_second = GetPopupWorkAreaBottomForTray(GetSecondaryTray()); 387 int bottom_second = GetPopupWorkAreaBottomForTray(GetSecondaryTray());
389 388
390 // System tray is created on the primary display. The popups in the secondary 389 // System tray is created on the primary display. The popups in the secondary
391 // tray aren't affected. 390 // tray aren't affected.
392 GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW); 391 GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
393 EXPECT_GT(bottom, GetPopupWorkAreaBottom()); 392 EXPECT_GT(bottom, GetPopupWorkAreaBottom());
394 EXPECT_EQ(bottom_second, GetPopupWorkAreaBottomForTray(GetSecondaryTray())); 393 EXPECT_EQ(bottom_second, GetPopupWorkAreaBottomForTray(GetSecondaryTray()));
395 } 394 }
396 395
397 } // namespace ash 396 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/toplevel_window.cc ('k') | ash/wm/ash_focus_rules.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698