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

Side by Side Diff: Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp

Issue 11519009: Merge 136785 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 bool RuntimeEnabledFeatures::isInputTypeWeekEnabled = false; 234 bool RuntimeEnabledFeatures::isInputTypeWeekEnabled = false;
235 #else 235 #else
236 bool RuntimeEnabledFeatures::isInputTypeWeekEnabled = true; 236 bool RuntimeEnabledFeatures::isInputTypeWeekEnabled = true;
237 #endif 237 #endif
238 #endif 238 #endif
239 239
240 #if ENABLE(DIALOG_ELEMENT) 240 #if ENABLE(DIALOG_ELEMENT)
241 bool RuntimeEnabledFeatures::isDialogElementEnabled = false; 241 bool RuntimeEnabledFeatures::isDialogElementEnabled = false;
242 #endif 242 #endif
243 243
244 #if ENABLE(WEB_INTENTS)
245 bool RuntimeEnabledFeatures::isWebIntentsEnabled = true;
246 #endif
247
244 } // namespace WebCore 248 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h ('k') | Source/WebKit/chromium/public/WebRuntimeFeatures.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698