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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: WebCore/page/Settings.h

Issue 1696004: Merge 57922 - 20100420 Justin Schuh <jschuh@chromium.org>... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/WebKit/375/
Patch Set: Created 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « WebCore/dom/make_names.pl ('k') | WebCore/page/Settings.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 3 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 void setSpatialNavigationEnabled(bool); 125 void setSpatialNavigationEnabled(bool);
126 bool isSpatialNavigationEnabled() const { return m_isSpatialNavigationEn abled; } 126 bool isSpatialNavigationEnabled() const { return m_isSpatialNavigationEn abled; }
127 127
128 void setJavaEnabled(bool); 128 void setJavaEnabled(bool);
129 bool isJavaEnabled() const { return m_isJavaEnabled; } 129 bool isJavaEnabled() const { return m_isJavaEnabled; }
130 130
131 void setImagesEnabled(bool); 131 void setImagesEnabled(bool);
132 bool areImagesEnabled() const { return m_areImagesEnabled; } 132 bool areImagesEnabled() const { return m_areImagesEnabled; }
133 133
134 void setMediaEnabled(bool);
135 bool isMediaEnabled() const { return m_isMediaEnabled; }
136
134 void setPluginsEnabled(bool); 137 void setPluginsEnabled(bool);
135 bool arePluginsEnabled() const { return m_arePluginsEnabled; } 138 bool arePluginsEnabled() const { return m_arePluginsEnabled; }
136 139
137 void setLocalStorageEnabled(bool); 140 void setLocalStorageEnabled(bool);
138 bool localStorageEnabled() const { return m_localStorageEnabled; } 141 bool localStorageEnabled() const { return m_localStorageEnabled; }
139 142
140 void setLocalStorageQuota(unsigned); 143 void setLocalStorageQuota(unsigned);
141 unsigned localStorageQuota() const { return m_localStorageQuota; } 144 unsigned localStorageQuota() const { return m_localStorageQuota; }
142 145
143 void setPrivateBrowsingEnabled(bool); 146 void setPrivateBrowsingEnabled(bool);
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 size_t m_maximumDecodedImageSize; 319 size_t m_maximumDecodedImageSize;
317 unsigned m_localStorageQuota; 320 unsigned m_localStorageQuota;
318 unsigned m_pluginAllowedRunTime; 321 unsigned m_pluginAllowedRunTime;
319 ZoomMode m_zoomMode; 322 ZoomMode m_zoomMode;
320 bool m_isSpatialNavigationEnabled : 1; 323 bool m_isSpatialNavigationEnabled : 1;
321 bool m_isJavaEnabled : 1; 324 bool m_isJavaEnabled : 1;
322 bool m_loadsImagesAutomatically : 1; 325 bool m_loadsImagesAutomatically : 1;
323 bool m_privateBrowsingEnabled : 1; 326 bool m_privateBrowsingEnabled : 1;
324 bool m_caretBrowsingEnabled : 1; 327 bool m_caretBrowsingEnabled : 1;
325 bool m_areImagesEnabled : 1; 328 bool m_areImagesEnabled : 1;
329 bool m_isMediaEnabled : 1;
326 bool m_arePluginsEnabled : 1; 330 bool m_arePluginsEnabled : 1;
327 bool m_localStorageEnabled : 1; 331 bool m_localStorageEnabled : 1;
328 bool m_isJavaScriptEnabled : 1; 332 bool m_isJavaScriptEnabled : 1;
329 bool m_isWebSecurityEnabled : 1; 333 bool m_isWebSecurityEnabled : 1;
330 bool m_allowUniversalAccessFromFileURLs: 1; 334 bool m_allowUniversalAccessFromFileURLs: 1;
331 bool m_allowFileAccessFromFileURLs: 1; 335 bool m_allowFileAccessFromFileURLs: 1;
332 bool m_javaScriptCanOpenWindowsAutomatically : 1; 336 bool m_javaScriptCanOpenWindowsAutomatically : 1;
333 bool m_shouldPrintBackgrounds : 1; 337 bool m_shouldPrintBackgrounds : 1;
334 bool m_textAreasAreResizable : 1; 338 bool m_textAreasAreResizable : 1;
335 #if ENABLE(DASHBOARD_SUPPORT) 339 #if ENABLE(DASHBOARD_SUPPORT)
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 static bool gShouldPaintNativeControls; 377 static bool gShouldPaintNativeControls;
374 #endif 378 #endif
375 #if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX)) 379 #if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
376 static bool gShouldUseHighResolutionTimers; 380 static bool gShouldUseHighResolutionTimers;
377 #endif 381 #endif
378 }; 382 };
379 383
380 } // namespace WebCore 384 } // namespace WebCore
381 385
382 #endif // Settings_h 386 #endif // Settings_h
OLDNEW
« no previous file with comments | « WebCore/dom/make_names.pl ('k') | WebCore/page/Settings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698