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

Side by Side Diff: ui/base/cursor/cursor_loader_win.cc

Issue 23533057: Makes native_widget_types forward declare ui::Cursor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux_aura Created 7 years, 3 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 "ui/base/cursor/cursor_loader_win.h"
6
5 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
6 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
7 #include "ui/base/cursor/cursor_loader_win.h"
8 #include "grit/ui_unscaled_resources.h" 9 #include "grit/ui_unscaled_resources.h"
9 10
11 #if defined(USE_AURA)
12 #include "ui/base/cursor/cursor.h"
13 #endif
14
10 namespace ui { 15 namespace ui {
11 16
12 #if defined(USE_AURA) 17 #if defined(USE_AURA)
13 18
14 namespace { 19 namespace {
15 20
16 base::LazyInstance<string16> g_cursor_resource_module_name; 21 base::LazyInstance<string16> g_cursor_resource_module_name;
17 22
18 const wchar_t* GetCursorId(gfx::NativeCursor native_cursor) { 23 const wchar_t* GetCursorId(gfx::NativeCursor native_cursor) {
19 switch (native_cursor.native_type()) { 24 switch (native_cursor.native_type()) {
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 } 169 }
165 170
166 #if defined(USE_AURA) 171 #if defined(USE_AURA)
167 // static 172 // static
168 void CursorLoaderWin::SetCursorResourceModule(const string16& module_name) { 173 void CursorLoaderWin::SetCursorResourceModule(const string16& module_name) {
169 g_cursor_resource_module_name.Get() = module_name; 174 g_cursor_resource_module_name.Get() = module_name;
170 } 175 }
171 #endif 176 #endif
172 177
173 } // namespace ui 178 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698