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

Side by Side Diff: webkit/glue/webview_impl.cc

Issue 2915: Add a new switch: --allow-scripts-to-close-windows.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 3 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 | « webkit/glue/webpreferences.h ('k') | webkit/pending/DOMWindow.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 2007 Google Inc. All Rights Reserved. 2 * Copyright 2007 Google Inc. All Rights Reserved.
3 * 3 *
4 * Portions Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 4 * Portions Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
5 * 5 *
6 * ***** BEGIN LICENSE BLOCK ***** 6 * ***** BEGIN LICENSE BLOCK *****
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 preferences.javascript_can_open_windows_automatically); 1099 preferences.javascript_can_open_windows_automatically);
1100 settings->setLoadsImagesAutomatically( 1100 settings->setLoadsImagesAutomatically(
1101 preferences.loads_images_automatically); 1101 preferences.loads_images_automatically);
1102 settings->setPluginsEnabled(preferences.plugins_enabled); 1102 settings->setPluginsEnabled(preferences.plugins_enabled);
1103 settings->setDOMPasteAllowed(preferences.dom_paste_enabled); 1103 settings->setDOMPasteAllowed(preferences.dom_paste_enabled);
1104 settings->setDeveloperExtrasEnabled(preferences.developer_extras_enabled); 1104 settings->setDeveloperExtrasEnabled(preferences.developer_extras_enabled);
1105 settings->setShrinksStandaloneImagesToFit( 1105 settings->setShrinksStandaloneImagesToFit(
1106 preferences.shrinks_standalone_images_to_fit); 1106 preferences.shrinks_standalone_images_to_fit);
1107 settings->setUsesUniversalDetector(preferences.uses_universal_detector); 1107 settings->setUsesUniversalDetector(preferences.uses_universal_detector);
1108 settings->setTextAreasAreResizable(preferences.text_areas_are_resizable); 1108 settings->setTextAreasAreResizable(preferences.text_areas_are_resizable);
1109 settings->setAllowScriptsToCloseWindows(
1110 preferences.allow_scripts_to_close_windows);
1109 if (preferences.user_style_sheet_enabled) { 1111 if (preferences.user_style_sheet_enabled) {
1110 settings->setUserStyleSheetLocation(webkit_glue::GURLToKURL( 1112 settings->setUserStyleSheetLocation(webkit_glue::GURLToKURL(
1111 preferences.user_style_sheet_location)); 1113 preferences.user_style_sheet_location));
1112 } else { 1114 } else {
1113 settings->setUserStyleSheetLocation(KURL()); 1115 settings->setUserStyleSheetLocation(KURL());
1114 } 1116 }
1115 1117
1116 // This setting affects the behavior of links in an editable region: 1118 // This setting affects the behavior of links in an editable region:
1117 // clicking the link should select it rather than navigate to it. 1119 // clicking the link should select it rather than navigate to it.
1118 // Safari uses the same default. It is unlikley an embedder would want to 1120 // Safari uses the same default. It is unlikley an embedder would want to
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 } 1539 }
1538 1540
1539 void WebViewImpl::DeleteImageResourceFetcher(ImageResourceFetcher* fetcher) { 1541 void WebViewImpl::DeleteImageResourceFetcher(ImageResourceFetcher* fetcher) {
1540 DCHECK(image_fetchers_.find(fetcher) != image_fetchers_.end()); 1542 DCHECK(image_fetchers_.find(fetcher) != image_fetchers_.end());
1541 image_fetchers_.erase(fetcher); 1543 image_fetchers_.erase(fetcher);
1542 1544
1543 // We're in the callback from the ImageResourceFetcher, best to delay 1545 // We're in the callback from the ImageResourceFetcher, best to delay
1544 // deletion. 1546 // deletion.
1545 MessageLoop::current()->DeleteSoon(FROM_HERE, fetcher); 1547 MessageLoop::current()->DeleteSoon(FROM_HERE, fetcher);
1546 } 1548 }
OLDNEW
« no previous file with comments | « webkit/glue/webpreferences.h ('k') | webkit/pending/DOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698