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

Side by Side Diff: content/shell/common/webkit_test_helpers.cc

Issue 27072003: Remove 2 members from webpreference (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 | « content/shell/app/shell_main_delegate.cc ('k') | webkit/common/webpreferences.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/common/webkit_test_helpers.h" 5 #include "content/shell/common/webkit_test_helpers.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 23 matching lines...) Expand all
34 to->plugins_enabled = from.pluginsEnabled; 34 to->plugins_enabled = from.pluginsEnabled;
35 to->java_enabled = from.javaEnabled; 35 to->java_enabled = from.javaEnabled;
36 to->application_cache_enabled = from.offlineWebApplicationCacheEnabled; 36 to->application_cache_enabled = from.offlineWebApplicationCacheEnabled;
37 to->tabs_to_links = from.tabsToLinks; 37 to->tabs_to_links = from.tabsToLinks;
38 to->experimental_webgl_enabled = from.experimentalWebGLEnabled; 38 to->experimental_webgl_enabled = from.experimentalWebGLEnabled;
39 // experimentalCSSRegionsEnabled is deprecated and ignored. 39 // experimentalCSSRegionsEnabled is deprecated and ignored.
40 to->hyperlink_auditing_enabled = from.hyperlinkAuditingEnabled; 40 to->hyperlink_auditing_enabled = from.hyperlinkAuditingEnabled;
41 to->caret_browsing_enabled = from.caretBrowsingEnabled; 41 to->caret_browsing_enabled = from.caretBrowsingEnabled;
42 to->allow_displaying_insecure_content = from.allowDisplayOfInsecureContent; 42 to->allow_displaying_insecure_content = from.allowDisplayOfInsecureContent;
43 to->allow_running_insecure_content = from.allowRunningOfInsecureContent; 43 to->allow_running_insecure_content = from.allowRunningOfInsecureContent;
44 to->css_shaders_enabled = from.cssCustomFilterEnabled;
45 to->should_respect_image_orientation = from.shouldRespectImageOrientation; 44 to->should_respect_image_orientation = from.shouldRespectImageOrientation;
46 to->asynchronous_spell_checking_enabled = 45 to->asynchronous_spell_checking_enabled =
47 from.asynchronousSpellCheckingEnabled; 46 from.asynchronousSpellCheckingEnabled;
48 to->allow_file_access_from_file_urls = from.allowFileAccessFromFileURLs; 47 to->allow_file_access_from_file_urls = from.allowFileAccessFromFileURLs;
49 to->author_and_user_styles_enabled = from.authorAndUserStylesEnabled; 48 to->author_and_user_styles_enabled = from.authorAndUserStylesEnabled;
50 to->javascript_can_open_windows_automatically = 49 to->javascript_can_open_windows_automatically =
51 from.javaScriptCanOpenWindowsAutomatically; 50 from.javaScriptCanOpenWindowsAutomatically;
52 to->user_style_sheet_location = from.userStyleSheetLocation; 51 to->user_style_sheet_location = from.userStyleSheetLocation;
53 } 52 }
54 53
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 prefs->viewport_enabled = false; 114 prefs->viewport_enabled = false;
116 } 115 }
117 116
118 base::FilePath GetWebKitRootDirFilePath() { 117 base::FilePath GetWebKitRootDirFilePath() {
119 base::FilePath base_path; 118 base::FilePath base_path;
120 PathService::Get(base::DIR_SOURCE_ROOT, &base_path); 119 PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
121 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit")); 120 return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
122 } 121 }
123 122
124 } // namespace content 123 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/app/shell_main_delegate.cc ('k') | webkit/common/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698