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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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 "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" 7 #include "ash/display/display_info.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 #include "ash/test/cursor_manager_test_api.h" 11 #include "ash/test/cursor_manager_test_api.h"
12 #include "ui/aura/test/aura_test_utils.h" 12 #include "ui/aura/test/aura_test_utils.h"
13 #include "ui/aura/test/test_window_delegate.h" 13 #include "ui/aura/test/test_window_delegate.h"
14 #include "ui/aura/test/test_windows.h" 14 #include "ui/aura/test/test_windows.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 #include "ui/aura/window_event_dispatcher.h" 16 #include "ui/aura/window_event_dispatcher.h"
17 #include "ui/base/cursor/image_cursors.h" 17 #include "ui/base/cursor/image_cursors.h"
18 #include "ui/gfx/screen.h" 18 #include "ui/gfx/screen.h"
19 19
20 #if defined(OS_WIN) 20 #if defined(OS_WIN)
21 #include "base/win/windows_version.h" 21 #include "base/win/windows_version.h"
22 #include "ui/base/cursor/cursor_loader_win.h" 22 #include "ui/base/cursor/cursor_loader_win.h"
23 #endif 23 #endif
24 24
25 #if defined(USE_X11) 25 #if defined(USE_X11)
26 #include "grit/ui_resources.h"
27 #include "ui/base/cursor/cursor_loader_x11.h" 26 #include "ui/base/cursor/cursor_loader_x11.h"
27 #include "ui/resources/grit/ui_resources.h"
28 #endif 28 #endif
29 29
30 namespace ash { 30 namespace ash {
31 namespace test { 31 namespace test {
32 32
33 namespace { 33 namespace {
34 34
35 // A delegate for recording a mouse event location. 35 // A delegate for recording a mouse event location.
36 class MouseEventLocationDelegate : public aura::test::TestWindowDelegate { 36 class MouseEventLocationDelegate : public aura::test::TestWindowDelegate {
37 public: 37 public:
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 loader.set_scale(2.0f); 198 loader.set_scale(2.0f);
199 loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point()); 199 loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point());
200 image = loader.GetXcursorImageForTest(kCursorId); 200 image = loader.GetXcursorImageForTest(kCursorId);
201 EXPECT_EQ(height * 2, static_cast<int>(image->height)); 201 EXPECT_EQ(height * 2, static_cast<int>(image->height));
202 EXPECT_EQ(width * 2, static_cast<int>(image->width)); 202 EXPECT_EQ(width * 2, static_cast<int>(image->width));
203 } 203 }
204 #endif 204 #endif
205 205
206 } // namespace test 206 } // namespace test
207 } // namespace ash 207 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/user/accounts_detailed_view.cc ('k') | chrome/browser/browsing_data/cookies_tree_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698