diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-10 02:10:34 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-10 02:10:34 +0000 |
| commit | 12d8cfc27ef90b8dcef76966172f7356555a224b (patch) | |
| tree | e065aeece4e56d46c57a3cef0566c617299846b5 /ash/wm/ash_native_cursor_manager.h | |
| parent | 15c7e8af4a22221b89edb50601c6893baa418fbc (diff) | |
| download | chromium_src-12d8cfc27ef90b8dcef76966172f7356555a224b.zip chromium_src-12d8cfc27ef90b8dcef76966172f7356555a224b.tar.gz chromium_src-12d8cfc27ef90b8dcef76966172f7356555a224b.tar.bz2 | |
Please discard this CL. Will upload a new one in a bit
Relanding this with fixes for the Win64 builder and addressing jam's comment to move the call to SetCursorResourceModuleName
to chrome_browser_main.cc.
To fix the Win64 builder issues, the SetCursorResourceModuleName function in cursor_loader_win.cc/.h has been wrapped in
a ifdef(USE_AURA) block. As per jam's comment I have moved the call to the SetCursorResourceModuleName function to
ChromeBrowserMainPartsWin::ToolkitInitialized
Make the SetCursorResourceModuleName function in the CursorLoaderWin class a static function and remove it from the
CursorLoader and CursorClient interface. This function is called during browser initialization which prevents race conditions
from reading the cursor module name before it was set.
This ensures that the non standard webkit cursors can be loaded correctly when needed.
Fixes bug https://code.google.com/p/chromium/issues/detail?id=257983
Bug=257983
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/18939004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210717 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/ash_native_cursor_manager.h')
| -rw-r--r-- | ash/wm/ash_native_cursor_manager.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ash/wm/ash_native_cursor_manager.h b/ash/wm/ash_native_cursor_manager.h index 60eec94..5ea9ec9 100644 --- a/ash/wm/ash_native_cursor_manager.h +++ b/ash/wm/ash_native_cursor_manager.h @@ -52,8 +52,6 @@ class ASH_EXPORT AshNativeCursorManager virtual void SetMouseEventsEnabled( bool enabled, views::corewm::NativeCursorManagerDelegate* delegate) OVERRIDE; - virtual void SetCursorResourceModule( - const base::string16& module_name) OVERRIDE; // The cursor location where the cursor was disabled. gfx::Point disabled_cursor_location_; |