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

Unified Diff: third_party/WebKit/Source/core/loader/resource/ImageResource.h

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: More fixes - things build fine at this point. Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/loader/resource/ImageResource.h
diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResource.h b/third_party/WebKit/Source/core/loader/resource/ImageResource.h
index 53082f99cfdd6f0c3e562593b718d7b49fc8d2c2..07eba9936d6ff2284d19d471361f9acefb05b41c 100644
--- a/third_party/WebKit/Source/core/loader/resource/ImageResource.h
+++ b/third_party/WebKit/Source/core/loader/resource/ImageResource.h
@@ -173,6 +173,8 @@ class CORE_EXPORT ImageResource final
};
DEFINE_RESOURCE_TYPE_CASTS(Image);
+/* DO NOT SUBMIT - Conflict resolution helper:
+ * Above we should have Image, not kImage */
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698