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

Side by Side Diff: chrome/browser/notifications/desktop_notifications_unittest.cc

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | Annotate | Revision Log
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 "chrome/browser/notifications/desktop_notifications_unittest.h" 5 #include "chrome/browser/notifications/desktop_notifications_unittest.h"
6 6
7 #include "base/prefs/testing_pref_service.h" 7 #include "base/prefs/testing_pref_service.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/notifications/balloon_notification_ui_manager.h" 10 #include "chrome/browser/notifications/balloon_notification_ui_manager.h"
(...skipping 10 matching lines...) Expand all
21 #if defined(USE_ASH) 21 #if defined(USE_ASH)
22 #include "ash/shell.h" 22 #include "ash/shell.h"
23 #include "ash/test/test_shell_delegate.h" 23 #include "ash/test/test_shell_delegate.h"
24 #include "ui/aura/env.h" 24 #include "ui/aura/env.h"
25 #include "ui/aura/window_event_dispatcher.h" 25 #include "ui/aura/window_event_dispatcher.h"
26 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 26 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
27 #include "ui/compositor/test/context_factories_for_test.h" 27 #include "ui/compositor/test/context_factories_for_test.h"
28 #endif 28 #endif
29 29
30 #if defined(USE_AURA) 30 #if defined(USE_AURA)
31 #include "ui/views/corewm/wm_state.h" 31 #include "ui/wm/core/wm_state.h"
32 #endif 32 #endif
33 33
34 34
35 using content::BrowserThread; 35 using content::BrowserThread;
36 36
37 // static 37 // static
38 const int MockBalloonCollection::kMockBalloonSpace = 5; 38 const int MockBalloonCollection::kMockBalloonSpace = 5;
39 39
40 // static 40 // static
41 std::string DesktopNotificationsTest::log_output_; 41 std::string DesktopNotificationsTest::log_output_;
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 } 575 }
576 576
577 // Now change the position to upper left. Confirm that the X value for the 577 // Now change the position to upper left. Confirm that the X value for the
578 // balloons gets smaller. 578 // balloons gets smaller.
579 local_state_.SetInteger(prefs::kDesktopNotificationPosition, 579 local_state_.SetInteger(prefs::kDesktopNotificationPosition,
580 BalloonCollection::UPPER_LEFT); 580 BalloonCollection::UPPER_LEFT);
581 581
582 int current_x = (*balloons.begin())->GetPosition().x(); 582 int current_x = (*balloons.begin())->GetPosition().x();
583 EXPECT_LT(current_x, last_x); 583 EXPECT_LT(current_x, last_x);
584 } 584 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698