From d0825bca7fe65beaee391d30da42e937db621564 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 2 Feb 2010 14:57:50 +0000
Subject: Merge webkit.org at r54127 : Initial merge by git

Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
---
 WebKit/chromium/src/WebSettingsImpl.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'WebKit/chromium/src/WebSettingsImpl.h')

diff --git a/WebKit/chromium/src/WebSettingsImpl.h b/WebKit/chromium/src/WebSettingsImpl.h
index 9c0f9f4..3b69fe6 100644
--- a/WebKit/chromium/src/WebSettingsImpl.h
+++ b/WebKit/chromium/src/WebSettingsImpl.h
@@ -60,6 +60,7 @@ public:
     virtual void setWebSecurityEnabled(bool);
     virtual void setJavaScriptCanOpenWindowsAutomatically(bool);
     virtual void setLoadsImagesAutomatically(bool);
+    virtual void setImagesEnabled(bool);
     virtual void setPluginsEnabled(bool);
     virtual void setDOMPasteAllowed(bool);
     virtual void setDeveloperExtrasEnabled(bool);
-- 
cgit v1.1