summaryrefslogtreecommitdiffstats
path: root/ash/wm/ash_native_cursor_manager.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 04:03:32 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 04:03:32 +0000
commited95e02da69e469de255362cdb4114fe8e4c0c64 (patch)
tree5bb68bc6517f35f14ca98498cbc4f52f8b3dcfff /ash/wm/ash_native_cursor_manager.h
parent603af7ca8d0238e9b1a12b14a67655b831b047b7 (diff)
downloadchromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.zip
chromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.tar.gz
chromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.tar.bz2
Update src/ash/ for renames and moves in base
Renames string16 -> base::string16 and base/string_number_conversions.h -> base/strings/string_number_conversions.h BUG= Review URL: https://codereview.chromium.org/13856005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/ash_native_cursor_manager.h')
-rw-r--r--ash/wm/ash_native_cursor_manager.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/wm/ash_native_cursor_manager.h b/ash/wm/ash_native_cursor_manager.h
index 506d381..5df8062 100644
--- a/ash/wm/ash_native_cursor_manager.h
+++ b/ash/wm/ash_native_cursor_manager.h
@@ -49,7 +49,8 @@ class ASH_EXPORT AshNativeCursorManager
virtual void SetMouseEventsEnabled(
bool enabled,
views::corewm::NativeCursorManagerDelegate* delegate) OVERRIDE;
- virtual void SetCursorResourceModule(const string16& module_name) OVERRIDE;
+ virtual void SetCursorResourceModule(
+ const base::string16& module_name) OVERRIDE;
// The cursor location where the cursor was disabled.
gfx::Point disabled_cursor_location_;