| OLD | NEW | 
|    1 // Copyright (c) 2011 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 "webkit/glue/webcursor.h" |    5 #include "webkit/glue/webcursor.h" | 
|    6  |    6  | 
|    7 #include "base/logging.h" |    7 #include "base/logging.h" | 
|    8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" |    8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" | 
|    9 #include "ui/aura/cursor.h" |    9 #include "ui/aura/cursor.h" | 
|   10  |   10  | 
|   11 using WebKit::WebCursorInfo; |   11 using WebKit::WebCursorInfo; | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  106   } |  106   } | 
|  107 } |  107 } | 
|  108  |  108  | 
|  109 void WebCursor::InitPlatformData() { |  109 void WebCursor::InitPlatformData() { | 
|  110 } |  110 } | 
|  111  |  111  | 
|  112 bool WebCursor::SerializePlatformData(Pickle* pickle) const { |  112 bool WebCursor::SerializePlatformData(Pickle* pickle) const { | 
|  113   return true; |  113   return true; | 
|  114 } |  114 } | 
|  115  |  115  | 
|  116 bool WebCursor::DeserializePlatformData(const Pickle* pickle, void** iter) { |  116 bool WebCursor::DeserializePlatformData(PickleIterator* iter) { | 
|  117   return true; |  117   return true; | 
|  118 } |  118 } | 
|  119  |  119  | 
|  120 bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const { |  120 bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const { | 
|  121   return true; |  121   return true; | 
|  122 } |  122 } | 
|  123  |  123  | 
|  124 void WebCursor::CleanupPlatformData() { |  124 void WebCursor::CleanupPlatformData() { | 
|  125 } |  125 } | 
|  126  |  126  | 
|  127 void WebCursor::CopyPlatformData(const WebCursor& other) { |  127 void WebCursor::CopyPlatformData(const WebCursor& other) { | 
|  128 } |  128 } | 
| OLD | NEW |