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

Side by Side Diff: ash/wm/ash_native_cursor_manager_unittest.cc

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. 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 unified diff | Download patch
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/wm/ash_native_cursor_manager.h" 5 #include "ash/wm/ash_native_cursor_manager.h"
6 6
7 #include "ash/display/display_info.h"
8 #include "ash/display/display_manager.h" 7 #include "ash/display/display_manager.h"
9 #include "ash/display/display_util.h" 8 #include "ash/display/display_util.h"
10 #include "ash/shell.h" 9 #include "ash/shell.h"
11 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
12 #include "ash/test/cursor_manager_test_api.h" 11 #include "ash/test/cursor_manager_test_api.h"
13 #include "ui/aura/test/aura_test_utils.h" 12 #include "ui/aura/test/aura_test_utils.h"
14 #include "ui/aura/test/test_window_delegate.h" 13 #include "ui/aura/test/test_window_delegate.h"
15 #include "ui/aura/test/test_windows.h" 14 #include "ui/aura/test/test_windows.h"
16 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
17 #include "ui/aura/window_event_dispatcher.h" 16 #include "ui/aura/window_event_dispatcher.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 loader.set_scale(2.0f); 222 loader.set_scale(2.0f);
224 loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point()); 223 loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point());
225 image = loader.GetXcursorImageForTest(kCursorId); 224 image = loader.GetXcursorImageForTest(kCursorId);
226 EXPECT_EQ(height * 2, static_cast<int>(image->height)); 225 EXPECT_EQ(height * 2, static_cast<int>(image->height));
227 EXPECT_EQ(width * 2, static_cast<int>(image->width)); 226 EXPECT_EQ(width * 2, static_cast<int>(image->width));
228 } 227 }
229 #endif 228 #endif
230 229
231 } // namespace test 230 } // namespace test
232 } // namespace ash 231 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/ash_native_cursor_manager_interactive_uitest.cc ('k') | chrome/browser/chromeos/display/overscan_calibrator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698